diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java b/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java index 5d56d33a..6216707d 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java @@ -37,6 +37,11 @@ public interface EmpUserDao extends CrudDao { * 根据部门编码查询用户,仅返回基本信息 */ List findUserListByOfficeCodes(EmpUser empUser); + + /** + * 根据公司编码查询用户,仅返回基本信息 + */ + List findUserListByCompanyCodes(EmpUser empUser); /** * 根据角色编码查询用户,仅返回基本信息 diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java index 81ffcaea..e29aa6ea 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java @@ -47,6 +47,11 @@ public interface EmpUserService extends CrudServiceApi { * 根据部门编码查询用户,仅返回基本信息 */ List findUserListByOfficeCodes(EmpUser empUser); + + /** + * 根据公司编码查询用户,仅返回基本信息 + */ + List findUserListByCompanyCodes(EmpUser empUser); /** * 根据角色编码查询用户,仅返回基本信息 diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java index ff71bf89..eb3ee1ac 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java @@ -115,6 +115,13 @@ public class EmpUserServiceSupport extends CrudService public List findUserListByOfficeCodes(EmpUser empUser){ return dao.findUserListByOfficeCodes(empUser); } + /** + * 根据公司编码查询用户,仅返回基本信息 + */ + @Override + public List findUserListByCompanyCodes(EmpUser empUser){ + return dao.findUserListByCompanyCodes(empUser); + } /** * 根据角色编码查询用户,仅返回基本信息 diff --git a/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml b/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml index 4cd47ad6..bad1c37f 100644 --- a/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml +++ b/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml @@ -8,7 +8,7 @@ typeHandler="com.jeesite.common.mybatis.type.AesTypeHandler"/> --> - SELECT - + FROM ${_prefix}sys_user a WHERE a.status = #{STATUS_NORMAL} AND a.user_type = #{USER_TYPE_EMPLOYEE} - AND a.corp_code = #{corpCode} - + AND a.corp_code = #{corpCode} + ORDER BY a.user_code + + + SELECT - + FROM ${_prefix}sys_user a JOIN ${_prefix}sys_employee e ON e.emp_code = a.ref_code JOIN ${_prefix}sys_employee_post ep ON ep.emp_code = e.emp_code @@ -116,10 +137,10 @@ WHERE a.status = #{STATUS_NORMAL} AND a.user_type = #{USER_TYPE_EMPLOYEE} - AND a.corp_code = #{corpCode} - - AND e.status = #{STATUS_NORMAL} - AND p.status = #{STATUS_NORMAL} + AND a.corp_code = #{corpCode} + + AND e.status = #{STATUS_NORMAL} + AND p.status = #{STATUS_NORMAL} AND p.post_code IN #{code}