From b2888557cbdf717b5ab673734d1863a38f5d551c Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Wed, 8 Jan 2025 17:10:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=BA=E5=BE=B7=E4=BA=BA=E5=8C=BB?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8D=E5=88=A0=E9=99=A4=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=8A=B6=E6=80=81=E5=86=BB=E7=BB=93=E5=92=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docus/server/collection/mapper/PowerUserMapper.java  | 8 ++++++++
 .../server/collection/service/IPowerUserService.java     | 8 ++++++++
 .../collection/service/impl/PowerUserServiceImpl.java    | 9 +++++++++
 .../collection/webservice/impl/UserServerImpl.java       | 2 +-
 src/main/resources/mapper/PowerUserMapper.xml            | 7 +++++++
 5 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/docus/server/collection/mapper/PowerUserMapper.java b/src/main/java/com/docus/server/collection/mapper/PowerUserMapper.java
index d716658..ea791ec 100644
--- a/src/main/java/com/docus/server/collection/mapper/PowerUserMapper.java
+++ b/src/main/java/com/docus/server/collection/mapper/PowerUserMapper.java
@@ -41,4 +41,12 @@ public interface PowerUserMapper {
      * @return 数据库删除信息
      */
     int delUserByUserName(@Param("userName") String userName);
+
+    /**
+     * 根据用户工号 将账号冻结与不可用
+     *
+     * @param userName 用户工号
+     * @return 数据库更新信息
+     */
+    int cancelUserByUserName(@Param("userName") String userName);
 }
diff --git a/src/main/java/com/docus/server/collection/service/IPowerUserService.java b/src/main/java/com/docus/server/collection/service/IPowerUserService.java
index f42964d..e9d2829 100644
--- a/src/main/java/com/docus/server/collection/service/IPowerUserService.java
+++ b/src/main/java/com/docus/server/collection/service/IPowerUserService.java
@@ -21,4 +21,12 @@ public interface IPowerUserService {
      * @return 删除结果
      */
     boolean delUserByUserName(String userName);
+
+    /**
+     * 根据用户工号 将账号冻结与不可用
+     *
+     * @param userName 用户工号
+     * @return 作废结果
+     */
+    boolean cancelUserByUserName(String userName);
 }
diff --git a/src/main/java/com/docus/server/collection/service/impl/PowerUserServiceImpl.java b/src/main/java/com/docus/server/collection/service/impl/PowerUserServiceImpl.java
index ec17385..521e5e1 100644
--- a/src/main/java/com/docus/server/collection/service/impl/PowerUserServiceImpl.java
+++ b/src/main/java/com/docus/server/collection/service/impl/PowerUserServiceImpl.java
@@ -59,6 +59,15 @@ public class PowerUserServiceImpl implements IPowerUserService {
         return true;
     }
 
+    @Override
+    public boolean cancelUserByUserName(String userName) {
+        PowerUser powerUser = powerUserMapper.getUserByUserName(userName);
+        if (Func.isEmpty(powerUser)) {
+            return true;
+        }
+        powerUserMapper.cancelUserByUserName(userName);
+        return true;
+    }
 
     /**
      * 从推送的用户信息和现在的用户信息，得到管辖科室
diff --git a/src/main/java/com/docus/server/collection/webservice/impl/UserServerImpl.java b/src/main/java/com/docus/server/collection/webservice/impl/UserServerImpl.java
index a2739c5..175c9a2 100644
--- a/src/main/java/com/docus/server/collection/webservice/impl/UserServerImpl.java
+++ b/src/main/java/com/docus/server/collection/webservice/impl/UserServerImpl.java
@@ -41,7 +41,7 @@ public class UserServerImpl implements IUserServer {
             // 判断操作类型 是否是删除，或者 删除标记的
             boolean isDel = (Func.isNotEmpty(operateType) && operateType.contains(delType)) || userDto.isDelFlag();
             if (isDel) {
-                iPowerUserService.delUserByUserName(userDto.getUserName());
+                iPowerUserService.cancelUserByUserName(userDto.getUserName());
             } else {
                 iPowerUserService.register(userDto);
             }
diff --git a/src/main/resources/mapper/PowerUserMapper.xml b/src/main/resources/mapper/PowerUserMapper.xml
index ca9eb98..009f29c 100644
--- a/src/main/resources/mapper/PowerUserMapper.xml
+++ b/src/main/resources/mapper/PowerUserMapper.xml
@@ -34,6 +34,13 @@
         delete from `docus_system`.`power_user` where `user_name` = #{userName}
     </delete>
 
+    <update id="cancelUserByUserName">
+        update `docus_system`.`power_user`
+        set `account_state`=2,
+            `enabled`=0
+        where  `user_name` = #{userName}
+    </update>
+
     <select id="getUserByUserName" resultType="com.docus.server.collection.entity.PowerUser">
         SELECT `user_id`,`user_name`,`user_pwd`,`power_dept`,`role_id` FROM `docus_system`.`power_user`
         WHERE `user_name` = #{userName}   LIMIT 1