From 043cb275dca43504cc3ca7607e7cb934b897f3e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= Date: Thu, 21 Feb 2019 10:55:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9BUG=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=9B=20=E5=AE=A2=E6=88=B7=E7=AB=AF=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=8F=96=E6=B6=88=E5=AE=A1=E6=A0=B8=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E5=92=8C=E5=88=A0=E9=99=A4=E7=9A=84=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4=E6=AD=A4?= =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=9B=20=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9=E6=88=90=E5=8A=9F=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/maintenance/UserManageController.java | 3 ++- .../java/com/nis/web/dao/configuration/IpMultiplexDao.xml | 4 ++-- .../com/nis/web/service/configuration/UserManageService.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) 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); }