diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
index 9de04c691..df964d637 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
@@ -188,6 +188,7 @@ public class UserManageController extends BaseController{
throw e;
}
}
+ addMessage(redirectAttributes,"info","add_success");
}else{
entity.setEditTime(createTime);
entity.setEditorId(entity.getCurrentUser().getId());
@@ -271,7 +272,7 @@ public class UserManageController extends BaseController{
}
}
}
-
+ addMessage(redirectAttributes,"info","update_success");
}
} catch (MaatConvertException e) {
addMessage(redirectAttributes,"error",message);
diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
index de56e1193..1b5f2b58d 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
@@ -806,7 +806,7 @@
FROM
ip_reuse_policy_cfg r
- where r.IS_VALID != -1
+ where (r.IS_VALID != -1 and r.is_audit != 3)
and r.user_name =#{userName}
@@ -815,7 +815,7 @@
FROM
ip_reuse_dnat_policy a
- where a.IS_VALID != -1
+ where (a.IS_VALID != -1 and a.is_audit != 3)
and a.translated_user_id =#{userName}
diff --git a/src/main/java/com/nis/web/service/configuration/UserManageService.java b/src/main/java/com/nis/web/service/configuration/UserManageService.java
index 8df13477a..b9a7c5c1c 100644
--- a/src/main/java/com/nis/web/service/configuration/UserManageService.java
+++ b/src/main/java/com/nis/web/service/configuration/UserManageService.java
@@ -110,7 +110,7 @@ public class UserManageService extends BaseService{
params.put("cmd",Constants.NTC_IP_REUSE_USER_PASSWORD);
params.put("server_ip", ip);
params.put("user_name", entity.getUserName());
- params.put("user_pwd", entity.getUserName());
+ params.put("user_pwd", entity.getUserPwd());
String url =Constants.IP_REUSE_CALL_CGI_URL ;
String recv = ConfigServiceUtil.getCGI(url, params);
}