From 0eb09a0dbb99059d538a02f83af98cc18a667a93 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 22 Mar 2024 14:43:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BC=96=E7=A0=81=E6=9F=A5=E8=AF=A2=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/modules/sys/entity/Post.java     | 11 +++++++++++
 .../main/resources/mappings/modules/sys/PostDao.xml   |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java
index 58e84130..a750fc6b 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java
@@ -35,6 +35,7 @@ public class Post extends DataEntity<Post> {
 	private Integer postSort;		// 岗位排序（升序）
 	
 	private String empCode; 		// 根据用户查询岗位
+	private String userCode;		// 根据用户编码查询
 
 	private String roleCodes;		// 关联的角色编号
 	private String roleNames;		// 关联的角色名称
@@ -110,6 +111,16 @@ public class Post extends DataEntity<Post> {
 		this.empCode = empCode;
 	}
 
+	@ApiModelProperty("根据用户编码查询")
+	public String getUserCode() {
+		return userCode;
+	}
+
+	public void setUserCode(String userCode) {
+		this.userCode = userCode;
+	}
+
+	@ApiModelProperty("岗位绑定角色编码")
 	public String getRoleCodes() {
 		return roleCodes;
 	}
diff --git a/modules/core/src/main/resources/mappings/modules/sys/PostDao.xml b/modules/core/src/main/resources/mappings/modules/sys/PostDao.xml
index e5ee369e..2f9d3e7d 100644
--- a/modules/core/src/main/resources/mappings/modules/sys/PostDao.xml
+++ b/modules/core/src/main/resources/mappings/modules/sys/PostDao.xml
@@ -7,13 +7,20 @@
 		SELECT ${sqlMap.column.toSql()}
 		FROM ${sqlMap.table.toSql()}
 		<if test="empCode != null and empCode != ''">
-			JOIN ${_prefix}sys_employee_post b on a.post_code = b.post_code
+			JOIN ${_prefix}sys_employee_post b ON b.post_code = a.post_code
+		</if>
+		<if test="userCode != null and userCode != ''">
+			JOIN ${_prefix}sys_employee_post b2 on b2.post_code = a.post_code
+			JOIN ${_prefix}sys_user u on u.ref_code = b2.emp_code AND u.user_type = 'employee'
 		</if>
 		<where>
 			${sqlMap.where.toSql()}
 			<if test="empCode != null and empCode != ''">
 				AND b.emp_code = #{empCode}
 			</if>
+			<if test="userCode != null and userCode != ''">
+				AND u.user_code = #{userCode}
+			</if>
 		</where>
 		ORDER BY ${sqlMap.order.toSql()}
 	</select>