From 96c9f3cbd2403185e769e072f5e7e65798eae201 Mon Sep 17 00:00:00 2001
From: zzc <Zhengzhic18@163.com>
Date: Fri, 28 Mar 2025 16:51:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=85=B7=E6=9C=89=E5=AE=A1=E6=A0=B8=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/domain/entity/SysUser.java           | 12 ++++++++++++
 .../system/domain/dto/AdminTenantUserDto.java        |  6 ++++++
 .../main/resources/mapper/system/SysUserMapper.xml   |  5 ++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java b/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java
index 997b8617..bd8bafcf 100644
--- a/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java
+++ b/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java
@@ -3,6 +3,8 @@ package com.acupuncture.common.core.domain.entity;
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
+
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.acupuncture.common.annotation.Excel;
@@ -96,11 +98,21 @@ public class SysUser extends BaseEntity
     private String tenantPhone;
     private Long scoreId;
 
+    @ApiModelProperty("是否具有审核权限(0不具有； 1具有)")
+    private Byte slaverAdmin;
     public SysUser()
     {
 
     }
 
+    public Byte getSlaverAdmin() {
+        return slaverAdmin;
+    }
+
+    public void setSlaverAdmin(Byte slaverAdmin) {
+        this.slaverAdmin = slaverAdmin;
+    }
+
     public String getTenantPhone() {
         return tenantPhone;
     }
diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java
index ea3dfb94..672ffa58 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java
@@ -3,6 +3,7 @@ package com.acupuncture.system.domain.dto;
 import com.acupuncture.common.utils.SecurityUtils;
 import com.acupuncture.system.domain.po.DmsUser;
 import com.acupuncture.system.service.AdminTenantUserService;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -36,6 +37,9 @@ public class AdminTenantUserDto {
         private String status;
 
         private String contactPhone;
+
+        @ApiModelProperty("是否具有审核权限(0不具有； 1具有)")
+        private Byte slaverAdmin;
 //
 //        public Long getTenantId() {
 //            return SecurityUtils.getTenantId();
@@ -61,6 +65,8 @@ public class AdminTenantUserDto {
         private String status;
 
         private String contactPhone;
+        @ApiModelProperty("是否具有审核权限(0不具有； 1具有)")
+        private Byte slaverAdmin;
     }
 
     @Data
diff --git a/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml b/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml
index 6fe48291..322dfd54 100644
--- a/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"     column="update_by"    />
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
+		<result property="slaverAdmin"       column="slaver_admin"       />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.tenant_id, 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,
+        select u.user_id, u.tenant_id, 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.slaver_admin,
         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
         from sys_user u
@@ -167,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
+		<if test="slaverAdmin != null">slaver_admin,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -182,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
+		<if test="slaverAdmin != null">#{slaverAdmin},</if>
  			sysdate()
  		)
 	</insert>