From e17de7b194268b6e850fb0e5b4bea2d4edd59857 Mon Sep 17 00:00:00 2001
From: OTTO <731554297@qq.com>
Date: Sun, 29 Sep 2024 10:32:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86):=20=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E7=A7=BB=E5=87=BA=E7=BB=84=E7=BB=87/=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E6=8C=87=E6=B4=BE=E7=BB=99=E8=BF=99=E4=B8=AA?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E7=9A=84=E5=B7=A5=E4=BD=9C=E9=A1=B9/?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=AF=A5=E6=80=8E=E4=B9=88=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 用户身份新增状态字段，默认值为normal
2. 新增用户身份状态枚举
---
 .../system/api/domain/SysUserDeptRole.java    | 84 ++-----------------
 .../common/core/enums/UserIdentityStatus.java | 21 +++++
 .../mapper/system/SysUserDeptRoleMapper.xml   | 25 ++++--
 3 files changed, 45 insertions(+), 85 deletions(-)
 create mode 100644 microservices-common/microservices-common-core/src/main/java/com/microservices/common/core/enums/UserIdentityStatus.java

diff --git a/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysUserDeptRole.java b/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysUserDeptRole.java
index 0513636fa..941a15dfa 100644
--- a/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysUserDeptRole.java
+++ b/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysUserDeptRole.java
@@ -2,11 +2,11 @@ package com.microservices.system.api.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Objects;
+import lombok.Data;
 /**
  * @author otto
  */
+@Data
 @ApiModel("用户与部门及部门对应角色的关联对象")
 public class SysUserDeptRole {
 
@@ -30,6 +30,9 @@ public class SysUserDeptRole {
     @ApiModelProperty("角色ID")
     private Long roleId;
 
+    @ApiModelProperty("身份状态")
+    private String state;
+
     /**
      * 部门对象
      */
@@ -45,81 +48,4 @@ public class SysUserDeptRole {
      */
     @ApiModelProperty(value = "角色对象", hidden = true)
     private SysRole sysRole;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SysUserDeptRole that = (SysUserDeptRole) o;
-        return deptId.equals(that.deptId) && userId.equals(that.userId) && roleId.equals(that.roleId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(deptId, userId, roleId);
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public SysDept getSysDept() {
-        return sysDept;
-    }
-
-    public void setSysDept(SysDept sysDept) {
-        this.sysDept = sysDept;
-    }
-
-    public SysUser getSysUser() {
-        return sysUser;
-    }
-
-    public void setSysUser(SysUser sysUser) {
-        this.sysUser = sysUser;
-    }
-
-    public SysRole getSysRole() {
-        return sysRole;
-    }
-
-    public void setSysRole(SysRole sysRole) {
-        this.sysRole = sysRole;
-    }
-
-    @Override
-    public String toString() {
-        return "SysUserDeptRole{" +
-                "deptId=" + deptId +
-                ", userId=" + userId +
-                ", roleId=" + roleId +
-                ", sysDept=" + sysDept +
-                ", sysUser=" + sysUser +
-                ", sysRole=" + sysRole +
-                '}';
-    }
 }
diff --git a/microservices-common/microservices-common-core/src/main/java/com/microservices/common/core/enums/UserIdentityStatus.java b/microservices-common/microservices-common-core/src/main/java/com/microservices/common/core/enums/UserIdentityStatus.java
new file mode 100644
index 000000000..fe43748f4
--- /dev/null
+++ b/microservices-common/microservices-common-core/src/main/java/com/microservices/common/core/enums/UserIdentityStatus.java
@@ -0,0 +1,21 @@
+package com.microservices.common.core.enums;
+
+import lombok.Getter;
+
+/**
+ * 用户身份状态
+ *
+ * @author OTTO
+ */
+@Getter
+public enum UserIdentityStatus {
+    NORMAL("normal", "正常"),
+    QUIT("quit", "已离职");
+    private final String state;
+    private final String info;
+
+    UserIdentityStatus(String state, String info) {
+        this.state = state;
+        this.info = info;
+    }
+}
diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml
index 0895aa4ad..7c9e151e6 100644
--- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml
+++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml
@@ -8,6 +8,7 @@
         <result property="deptId" column="dept_id"/>
         <result property="userId" column="user_id"/>
         <result property="roleId" column="role_id"/>
+        <result property="state" column="state"/>
         <association property="sysDept" column="dept_id" javaType="com.microservices.system.api.domain.SysDept"
                      resultMap="deptResult"/>
         <association property="sysRole" column="role_id" javaType="com.microservices.system.api.domain.SysRole"
@@ -49,7 +50,7 @@
         <result property="status" column="role_status"/>
     </resultMap>
     <sql id="selectSysUserDeptRoleVo">
-        select dept_id, user_id, role_id
+        select dept_id, user_id, role_id, state
         from sys_user_dept_role
     </sql>
     <sql id="selectSysUserDeptRoleDetailVo">
@@ -76,7 +77,8 @@
                r.role_key,
                r.role_sort,
                r.data_scope,
-               r.status as role_status
+               r.status as role_status,
+               udr.state
         from sys_user_dept_role udr
                  left join sys_dept d on udr.dept_id = d.dept_id
                  left join sys_role r on r.role_id = udr.role_id
@@ -91,12 +93,14 @@
             <if test="deptId != null">and udr.dept_id=#{deptId}</if>
             <if test="userId != null">and udr.user_id=#{userId}</if>
             <if test="roleId != null">and udr.role_id=#{roleId}</if>
+            and udr.state = 'normal'
         </where>
     </select>
 
     <select id="selectSysUserDeptRoleByDeptId" parameterType="Long" resultMap="SysUserDeptRoleResult">
         <include refid="selectSysUserDeptRoleVo"/>
         where dept_id = #{deptId}
+        and state = 'normal'
     </select>
     <select id="selectSysUserDeptRoleListByDeptId" resultMap="SysUserDeptRoleResult">
         <include refid="selectSysUserDeptRoleDetailVo"/>
@@ -134,6 +138,7 @@
                     #{virtualRoleId}
                 </foreach>
             </if>
+            and udr.state = 'normal'
         </where>
     </select>
     <select id="selectSysUserDeptRoleListByUserId" resultMap="SysUserDeptRoleResult">
@@ -149,6 +154,7 @@
             <if test="roleName != null and roleName != ''">
                 AND r.role_name like concat('%', #{roleName}, '%')
             </if>
+            and udr.state = 'normal'
         </where>
         ORDER BY udr.dept_id
     </select>
@@ -157,6 +163,7 @@
         <where>
             u.user_name = #{userName}
             and u.del_flag = '0'
+            and udr.state = 'normal'
         </where>
     </select>
     <select id="selectSysUserDeptRoleByUserIdAndDeptId"
@@ -165,6 +172,7 @@
         <where>
             udr.user_id = #{userId}
             and udr.dept_id = #{deptId}
+            and udr.state = 'normal'
         </where>
     </select>
     <select id="selectSysUserDeptRoleByDeptIdAndRoleId"
@@ -173,6 +181,7 @@
         <where>
             udr.role_id = #{roleId}
             and udr.dept_id = #{deptId}
+            and udr.state = 'normal'
         </where>
 
     </select>
@@ -180,6 +189,7 @@
         SELECT COUNT(1)
         FROM sys_user_dept_role
         WHERE role_id = #{roleId}
+          and state = 'normal'
     </select>
     <select id="searchSysUserDeptRoleListByDeptId" resultMap="SysUserDeptRoleResult">
         <include refid="selectSysUserDeptRoleDetailVo"/>
@@ -198,20 +208,23 @@
                     </otherwise>
                 </choose>
             </if>
+            and udr.state = 'normal'
         </where>
     </select>
     <select id="countUserDeptRole" resultType="java.lang.Integer">
         SELECT COUNT(*)
-        FROM `sys_user_dept_role` AS sudr
-                 LEFT JOIN sys_role AS sr ON sr.role_id = sudr.`role_id`
+        FROM `sys_user_dept_role` AS udr
+                 LEFT JOIN sys_role AS sr ON sr.role_id = udr.`role_id`
         WHERE
             sr.`role_key` = #{roleKey}
-          AND sudr.user_id = #{userId}
-          AND sudr.dept_id = #{deptId}
+          AND udr.user_id = #{userId}
+          AND udr.dept_id = #{deptId}
+          and udr.state = 'normal'
     </select>
     <select id="selectSysUserDeptRoleListByRoleId" resultMap="SysUserDeptRoleResult">
         <include refid="selectSysUserDeptRoleVo"/>
         WHERE role_id = #{roleId}
+        and state = 'normal'
     </select>
 
     <insert id="insertSysUserDeptRole" parameterType="com.microservices.system.api.domain.SysUserDeptRole">