diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 5af317c..863fc53 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -3015,4 +3015,27 @@ public class UsersController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 人员列表(select) + * + * @param + * @return + * @throws Exception + */ + @RequestMapping("/getPractitionerSelectList") + @ResponseBody + @LogAnno(menuType = "综合管理", menuServer = "特种设备", instructionsOperate = "设备管理", instructionsType = "用户列表") + public Object getPractitionerSelectList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + //page.setPd(pd); + List userList = usersService.getPractitionerSelectList(pd);//列出用户列表 + map.put("userList", userList); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 4afc6ab..09a5f6a 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -298,4 +298,5 @@ public interface UsersMapper { PageData getUserByUserId(PageData pd); + List getPractitionerSelectList(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 4865b92..2ed77ea 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -371,4 +371,6 @@ public interface UsersService { PageData getUserByUserId(PageData pd); + List getPractitionerSelectList(PageData pd) throws Exception; + } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index 3059864..0eb0fba 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -1340,5 +1340,10 @@ public class UsersServiceImpl implements UsersService { return usersMapper.getUserByUserId(pd); } + @Override + public List getPractitionerSelectList(PageData pd) throws Exception { + return usersMapper.getPractitionerSelectList(pd); + } + } diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 87ea9cd..6c67a2e 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -522,6 +522,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.CORPINFO_ID = #{pd.CORPINFO_ID} + + AND c.PERSONNEL_TYPE = #{pd.PERSONNEL_TYPE} + order by d.LEVEL asc ,d.DEP_ORDER,d.DEPARTMENT_ID asc, u.SORT asc,u.USER_ID @@ -1839,4 +1842,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" USER_ID = #{USER_ID} + +