diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 6767590..394b35c 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -240,7 +240,7 @@ public class UsersController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //page.setPd(pd); List userList = usersService.userSelectPersonTypelist(pd);//列出用户列表 map.put("userList", userList); @@ -3031,7 +3031,7 @@ public class UsersController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - //page.setPd(pd); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List userList = usersService.getPractitionerSelectList(pd);//列出用户列表 map.put("userList", userList); map.put("pd", pd); 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 093e642..b71dfc6 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -272,8 +272,6 @@ public interface UsersMapper { List studentlist(PageData pd); - List userSelectPersonTypelistPage(PageData pd); - /**从业人员列表 //userlistPage(Page page) * @param page * @return diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 9da46bd..05754ed 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -318,7 +318,6 @@ public interface UsersService { void setState(PageData request) throws Exception; - List userSelectPersonTypelistPage(PageData pageData); List studentlist(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 ab1e5a6..d0c427a 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -668,11 +668,6 @@ public class UsersServiceImpl implements UsersService { usersMapper.editUser(request); } - @Override - public List userSelectPersonTypelistPage(PageData pd) { - return usersMapper.userSelectPersonTypelistPage(pd); - } - /** * 获取可以培训的人员列表 * diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 168e881..5344e4d 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1648,30 +1648,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dictionaries d on r.PERSONNEL_TYPE = d.DICTIONARIES_ID where u.ISDELETE = 0 - and d.DICTIONARIES_ID = '5ae743c76dbf496eb1b5101075b073d5' - - - - @@ -1863,7 +1842,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and d.PARENT_ID=#{PARENT_ID} - where u.ISDELETE = 0 and u.ISMAIN = '0' + where u.ISDELETE = 0 and u.ISMAIN = '0' and u.CORPINFO_ID = #{CORPINFO_ID} and d.BIANMA LIKE CONCAT(CONCAT('%', #{BIANMA}),'%')