From 78a08a79d5404e8b99abc788f6d03e2a4f5b3e4c Mon Sep 17 00:00:00 2001 From: fangcheng Date: Thu, 25 May 2017 21:41:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=88?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E4=BD=BF=E7=94=A8selector?= =?UTF-8?q?=E9=80=89=E6=8B=A9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/base/common/entity/user/Users.java | 14 +++ .../common/service/user/impl/UsersServiceImpl.java | 18 +-- .../lyms/cm/controller/sys/SysUsersController.java | 7 +- .../main/webapp/WEB-INF/views/user/user_edit.html | 124 ++------------------- 4 files changed, 38 insertions(+), 125 deletions(-) diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/user/Users.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/user/Users.java index dbac7d4..6b1150b 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/user/Users.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/user/Users.java @@ -147,6 +147,12 @@ public class Users implements Serializable { @TableField(exist=false) private String dataOrgIds; + + /** + * 角色列表数据权限，逗号分隔 + */ + @TableField(exist=false) + private String roles; public String getId() { @@ -349,6 +355,14 @@ public class Users implements Serializable { this.dataOrgIds = dataOrgIds; } + public String getRoles() { + return roles; + } + + public void setRoles(String roles) { + this.roles = roles; + } + } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java index 727d7ba..a95f231 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java @@ -129,14 +129,16 @@ public class UsersServiceImpl extends ServiceImpl implements sysUserDataPermissionsMapper .delete(new EntityWrapper().where("USER_ID={0}", user.getId())); - String[] dataPermissionArray = user.getDataOrgIds().split(","); - if (dataPermissionArray != null && dataPermissionArray.length > 0) { - for (String orgid : dataPermissionArray) { - SysUserDataPermissions dataEntity = new SysUserDataPermissions(); - dataEntity.setId(StrUtils.uuid()); - dataEntity.setOrgId(orgid); - dataEntity.setUserId(user.getId()); - sysUserDataPermissionsMapper.insert(dataEntity); + if(StrUtils.isNotEmpty(user.getDataOrgIds())){ + String[] dataPermissionArray = user.getDataOrgIds().split(","); + if (dataPermissionArray != null && dataPermissionArray.length > 0) { + for (String orgid : dataPermissionArray) { + SysUserDataPermissions dataEntity = new SysUserDataPermissions(); + dataEntity.setId(StrUtils.uuid()); + dataEntity.setOrgId(orgid); + dataEntity.setUserId(user.getId()); + sysUserDataPermissionsMapper.insert(dataEntity); + } } } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java index 58cd19a..2041db1 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java @@ -76,7 +76,7 @@ public class SysUsersController extends BaseController { } String userid = StrUtils.uuid(); user.setId(userid); - boolean tag = userService.addUser(user, getUserRoleList(userid, getParameter("roles"))); + boolean tag = userService.addUser(user, getUserRoleList(userid, user.getRoles())); return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); } @@ -153,8 +153,7 @@ public class SysUsersController extends BaseController { // 所有角色数据 List roleList = sysRolesService.selectList(new EntityWrapper().where("ifDel=0")); List orgs = sysOrganizationsService.getAllEnableOrg(); - - model.addAttribute("roleString", toJson(roleList)); + model.addAttribute("roleList", roleList); model.addAttribute("orgs", orgs); @@ -179,7 +178,7 @@ public class SysUsersController extends BaseController { ajaxResult.setMessage("修改失败！ " + user.getAccount() + " 已经存在，请修改登录账号！"); return ajaxResult; } - boolean tag = userService.updateUser(user, getUserRoleList(user.getId(), getParameter("roles"))); + boolean tag = userService.updateUser(user, getUserRoleList(user.getId(), user.getRoles())); return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); } diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html index 6a52d4c..8b7875e 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html @@ -1,115 +1,11 @@ #override("css") #end -#override("js") - - - -#end #override("body")
+
- -
@@ -180,10 +76,6 @@ $(function() {
- - #selector("dataOrgIds" "dataOrgIds" $orgs "${dataOrgids}" true) -
-
@@ -192,14 +84,20 @@ $(function() {
-
- + + #selector("dataOrgIds" "dataOrgIds" $orgs "${dataOrgids}" true) +
+
+


+
+
+ + #selector("roles" "roles" $roleList "$!userRoles" true)
+