From aa82d8c9934bde6f83eeca4331ba53a9b5a04cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com>
Date: Sat, 7 Jun 2025 16:20:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E4=B8=BA=E5=AE=A1=E6=A0=B8=E4=BA=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/core/domain/entity/SysUser.java   | 10 ++++++++++
 .../src/main/resources/mapper/system/SysUserMapper.xml |  8 +++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 9c116bf..a383eef 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -59,6 +59,8 @@ public class SysUser extends BaseEntity
     /** 用户头像 */
     private String avatar;
 
+    private Integer hasApproval;
+
     /** 密码 */
     private String password;
 
@@ -171,6 +173,14 @@ public class SysUser extends BaseEntity
         return userId != null && 1L == userId;
     }
 
+    public Integer getHasApproval() {
+        return hasApproval;
+    }
+
+    public void setHasApproval(Integer hasApproval) {
+        this.hasApproval = hasApproval;
+    }
+
     public Long getDeptId()
     {
         return deptId;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 6e7728a..fa9d69b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -11,6 +11,7 @@
 		<result property="nickName"     column="nick_name"    />
 		<result property="email"        column="email"        />
 		<result property="phonenumber"  column="phonenumber"  />
+		<result property="hasApproval"  column="has_approval"  />
 		<result property="sex"          column="sex"          />
 		<result property="avatar"       column="avatar"       />
 		<result property="password"     column="password"     />
@@ -55,7 +56,7 @@
 	</resultMap>
 
 	<sql id="selectUserVo">
-		select u.user_id,u.user_num,u.hat_size,u.bottoms_size,u.tops_size,u.shoe_size,
+		select u.user_id,u.user_num,u.hat_size,u.bottoms_size,u.tops_size,u.shoe_size,u.has_approval,
 		       u.user_type_cn,u.id_card, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.area_auth_code,
 			   d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
 			   r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
@@ -66,7 +67,7 @@
 	</sql>
 
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id,u.user_num,u.hat_size,u.bottoms_size,u.tops_size,u.shoe_size,u.user_type_cn,u.id_card, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.area_auth_code, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id,u.user_num,u.hat_size,u.bottoms_size,u.tops_size,u.has_approval,u.shoe_size,u.user_type_cn,u.id_card, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.area_auth_code, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
@@ -127,7 +128,7 @@
 	</select>
 
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-		select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+		select distinct u.user_id, u.dept_id, u.user_name,u.has_approval, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join sys_user_role ur on u.user_id = ur.user_id
@@ -256,6 +257,7 @@
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="remark != null">remark = #{remark},</if>
 			<if test="areaAuthCode != null">area_auth_code = #{areaAuthCode},</if>
+			<if test="hasApproval != null">has_approval = #{hasApproval},</if>
 
 			<if test="hatSize != null">hat_size = #{hatSize},</if>
 			<if test="topsSize != null">tops_size = #{topsSize},</if>