From ed40654d6a1bf145dacc3c35f27fab179f313f58 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 20 Feb 2025 17:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20findUserListByCompanyCodes?=
 =?UTF-8?q?=20=E6=96=B9=E6=B3=95,=E6=A0=B9=E6=8D=AE=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=92=8C=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeesite/modules/sys/dao/EmpUserDao.java   |  5 ++
 .../modules/sys/service/EmpUserService.java   |  5 ++
 .../support/EmpUserServiceSupport.java        |  7 +++
 .../mappings/modules/sys/EmpUserDao.xml       | 57 +++++++++++++------
 4 files changed, 56 insertions(+), 18 deletions(-)

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<EmpUser> {
 	 * 根据部门编码查询用户，仅返回基本信息
 	 */
 	List<EmpUser> findUserListByOfficeCodes(EmpUser empUser);
+
+	/**
+	 * 根据公司编码查询用户，仅返回基本信息
+	 */
+	List<EmpUser> 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<EmpUser> {
 	 * 根据部门编码查询用户，仅返回基本信息
 	 */
 	List<EmpUser> findUserListByOfficeCodes(EmpUser empUser);
+
+	/**
+	 * 根据公司编码查询用户，仅返回基本信息
+	 */
+	List<EmpUser> 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 827e5f28..a2f20737 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<EmpUserDao, EmpUser>
 	public List<EmpUser> findUserListByOfficeCodes(EmpUser empUser){
 		return dao.findUserListByOfficeCodes(empUser);
 	}
+	/**
+	 * 根据公司编码查询用户，仅返回基本信息
+	 */
+	@Override
+	public List<EmpUser> 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"/>
 	</resultMap> -->
 
-    <!-- 查询数据
+	<!-- 查询数据
 	<select id="findList" resultMap="empUserResult">  -->
 	<select id="findList" resultType="EmpUser">
 		SELECT ${sqlMap.column.toSql()}
@@ -54,50 +54,71 @@
 	<!-- 查询全部用户，仅返回基本信息  -->
 	<select id="findUserList" resultType="EmpUser">
 		SELECT 
-		    <include refid="userColumns"/>
+			<include refid="userColumns"/>
 		FROM ${_prefix}sys_user a
 		WHERE a.status = #{STATUS_NORMAL}
 			AND a.user_type = #{USER_TYPE_EMPLOYEE}
 			<if test="global.useCorpModel">
-		    	AND a.corp_code = #{corpCode}
-		    </if>
+				AND a.corp_code = #{corpCode}
+			</if>
 		ORDER BY a.user_code
 	</select>
 	
 	<!-- 根据部门编码查询用户，仅返回基本信息  -->
 	<select id="findUserListByOfficeCodes" resultType="EmpUser">
 		SELECT 
-		    <include refid="userColumns"/>
+			<include refid="userColumns"/>
 		FROM ${_prefix}sys_user a
 		JOIN ${_prefix}sys_employee e ON e.emp_code = a.ref_code
 		JOIN ${_prefix}sys_office o ON o.office_code = e.office_code
 		WHERE a.status = #{STATUS_NORMAL}
 			AND a.user_type = #{USER_TYPE_EMPLOYEE}
 			<if test="global.useCorpModel">
-		    	AND a.corp_code = #{corpCode}
-		    </if>
-		    AND e.status = #{STATUS_NORMAL}
-		    AND o.status = #{STATUS_NORMAL}
+				AND a.corp_code = #{corpCode}
+			</if>
+			AND e.status = #{STATUS_NORMAL}
+			AND o.status = #{STATUS_NORMAL}
 			AND o.office_code IN
 			<foreach item="code" index="index" collection="codes" open="(" separator="," close=")">
 				#{code}
 			</foreach>
 		ORDER BY a.user_code
 	</select>
+
+	<!-- 根据公司编码查询用户，仅返回基本信息  -->
+	<select id="findUserListByCompanyCodes" resultType="EmpUser">
+		SELECT
+			<include refid="userColumns"/>
+		FROM ${_prefix}sys_user a
+		JOIN ${_prefix}sys_employee e ON e.emp_code = a.ref_code
+		JOIN ${_prefix}sys_company o ON o.company_code = e.company_code
+		WHERE a.status = #{STATUS_NORMAL}
+			AND a.user_type = #{USER_TYPE_EMPLOYEE}
+			<if test="global.useCorpModel">
+				AND a.corp_code = #{corpCode}
+			</if>
+			AND e.status = #{STATUS_NORMAL}
+			AND o.status = #{STATUS_NORMAL}
+			AND o.company_code IN
+			<foreach item="code" index="index" collection="codes" open="(" separator="," close=")">
+				#{code}
+			</foreach>
+		ORDER BY a.user_code
+	</select>
 	
 	<!-- 根据角色编码查询用户，仅返回基本信息  -->
 	<select id="findUserListByRoleCodes" resultType="EmpUser">
 		SELECT 
-		    <include refid="userColumns"/>
+			<include refid="userColumns"/>
 		FROM ${_prefix}sys_user a
 		JOIN ${_prefix}sys_user_role ur2 ON ur2.user_code = a.user_code
 		JOIN ${_prefix}sys_role r ON r.role_code = ur2.role_code
 		WHERE a.status = #{STATUS_NORMAL}
 			AND a.user_type = #{USER_TYPE_EMPLOYEE}
 			<if test="global.useCorpModel">
-		    	AND a.corp_code = #{corpCode}
-		    </if>
-		    AND r.status = #{STATUS_NORMAL}
+				AND a.corp_code = #{corpCode}
+			</if>
+			AND r.status = #{STATUS_NORMAL}
 			AND r.role_code IN
 			<foreach item="code" index="index" collection="codes" open="(" separator="," close=")">
 				#{code}
@@ -108,7 +129,7 @@
 	<!-- 根据岗位编码查询用户，仅返回基本信息  -->
 	<select id="findUserListByPostCodes" resultType="EmpUser">
 		SELECT 
-		    <include refid="userColumns"/>
+			<include refid="userColumns"/>
 		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}
 			<if test="global.useCorpModel">
-		    	AND a.corp_code = #{corpCode}
-		    </if>
-		    AND e.status = #{STATUS_NORMAL}
-		    AND p.status = #{STATUS_NORMAL}
+				AND a.corp_code = #{corpCode}
+			</if>
+			AND e.status = #{STATUS_NORMAL}
+			AND p.status = #{STATUS_NORMAL}
 			AND p.post_code IN
 			<foreach item="code" index="index" collection="codes" open="(" separator="," close=")">
 				#{code}