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 fdb6cbb..24d97c7 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 @@ -14,10 +14,14 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; +import com.lyms.base.common.entity.organ.Departments; +import com.lyms.base.common.entity.organ.Organizations; import com.lyms.base.common.entity.role.Roles; import com.lyms.base.common.entity.role.UserRoleMaps; import com.lyms.base.common.entity.user.SysUserDataPermissions; import com.lyms.base.common.entity.user.Users; +import com.lyms.base.common.service.organ.DepartmentsService; +import com.lyms.base.common.service.organ.OrganizationsService; import com.lyms.base.common.service.role.RolesService; import com.lyms.base.common.service.role.UserRoleMapsService; import com.lyms.base.common.service.user.SysUserDataPermissionsService; @@ -49,6 +53,10 @@ public class SysUsersController extends BaseController { private UserRoleMapsService sysUserRoleMapsService; @Autowired private SysUserDataPermissionsService sysUserDataPermissionsService; + @Autowired + private OrganizationsService sysOrganizationsService; + @Autowired + private DepartmentsService sysDepartmentsService; /** * 创建用户 @@ -78,7 +86,9 @@ public class SysUsersController extends BaseController { * @return */ @RequestMapping(value = "/toList", method = { RequestMethod.GET }) - public String toList() { + public String toList(Model model) { + List orgs = sysOrganizationsService.selectList(new EntityWrapper().where("ifdel=0").and("status!=2")); + model.addAttribute("orgs", orgs); return "/user/user_list"; } @@ -126,7 +136,7 @@ public class SysUsersController extends BaseController { */ @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) public String toEdit(@PathVariable String id, Model model) { - if (!StringUtils.isBlank(id)) { + if (!StringUtils.isBlank(id) & !"0".equals(id)) { Users user = userService.selectById(id); model.addAttribute("user", user); // 当前用户角色数据 @@ -136,11 +146,16 @@ public class SysUsersController extends BaseController { for (UserRoleMaps urEntity : urList) { urSB.append("," + urEntity.getRoleId()); } + List depts = sysDepartmentsService.selectList(new EntityWrapper().where("ifdel=0").and("ORG_ID={0}",user.getOrgId())); model.addAttribute("userRoles", urSB.toString().replaceFirst(",", "")); + model.addAttribute("depts", depts); } // 所有角色数据 List roleList = sysRolesService.selectList(new EntityWrapper().where("ifDel=0")); + List orgs = sysOrganizationsService.selectList(new EntityWrapper().where("ifdel=0").and("status!=2")); + model.addAttribute("roleString", toJson(roleList)); + model.addAttribute("orgs", orgs); //数据权限 diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/common/base_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/common/base_list.html index 4bc7d12..4e3b492 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/common/base_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/common/base_list.html @@ -20,10 +20,11 @@ var APP = window['APP'] || {}; APP.PATH = "${ctx}"; + + #block("body")#end - @@ -34,7 +35,6 @@ - #block("js")#end +#end + + + ## 分页宏 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 a32ff95..77eed42 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 @@ -138,19 +138,19 @@ $(function() {
- +
- +
- + #selector("orgId" "orgId" $orgs $!user.orgId)
- +
- + #selector("deptId" "deptId" $depts $!user.deptId)
@@ -360,6 +360,35 @@ var default_dataColumns = [{ $(function () { var orgListTable = new orgLostTableInit(); orgListTable.Init(); + var orgId_select = $('#orgId'); + orgId_select.on("change",function(){ + if(orgId_select.val() != ""){ + var url = APP.PATH +"/sysDepartments/list"; + $.ajax({ + url: url, + cache: false, + data: { orgId : orgId_select.val() }, + dataType: "json", + success: function(data){ + if(data && data.rows){ + var deptOpt = $("#deptId option"); + deptOpt.remove(); + $('#deptId').append(''); + for(idx in data.rows){ + $('#deptId').append(''); + } + $('#deptId').selectator('destroy'); + $('#deptId').selectator({ + labels: { + search: 'Search here...' + } + }); + + } + } + }); + } + }); }) diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html index f2f34ef..af151b7 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html @@ -13,10 +13,8 @@
- -
-
- + 医院： + #selector("searchOrgId" "searchOrgId" $orgs )