From bcdfa1f26eddfa2e53eec71b9166953de1331ac3 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Tue, 30 Dec 2025 09:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=85=A5=E8=81=8C?=
 =?UTF-8?q?=E7=A6=BB=E8=81=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zcloud/basic/info/command/UserRemoveExe.java | 12 +++++-------
 .../info/persistence/dataobject/UserCorpInfoDO.java  |  2 +-
 .../src/main/resources/mapper/UserMapper.xml         |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java
index 9ad4dcf3..697b7bfc 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java
@@ -27,6 +27,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -73,14 +74,11 @@ public class UserRemoveExe {
         try {
             //TODO 处理所有未完成的工作，如果是非固定人员，包括所有企业的未完成工作
             // 如果是固定人员，判断是否离职
-            if(UserFlowFlagEnum.FIXED.equals(userDO.getEmploymentFlag().toString())&&UserEmploymentFlagEnum.ON.equals(userDO.getEmploymentFlag().toString())){
+            List<UserDO> userDOList = userRepository.getListByPhone(userDO.getPhone());
+           //过滤出固定人员
+            List<UserDO> fixedUserDOList = userDOList.stream().filter(userDO1 -> UserEmploymentFlagEnum.ON.equals(userDO1.getEmploymentFlag().toString())).collect(Collectors.toList());
+            if(CollUtil.isNotEmpty(fixedUserDOList)){
                 throw new BizException("您目前还有未离职信息,无法直接注销,请先在\"就职单位\"页面中离职");
-            }else if(UserFlowFlagEnum.FLOW.equals(userDO.getEmploymentFlag().toString())){
-                List<UserCorpDO> userCorpDOS = userCorpRepository.getONCorpInfo(cmd.getId());
-                if(CollUtil.isNotEmpty(userCorpDOS)){
-                    throw new BizException("您目前还有未离职信息,无法直接注销,请先在\"就职单位\"页面中离职");
-                }
-
             }
 
             // 删除用户表
diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserCorpInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserCorpInfoDO.java
index d0913ab8..0d69fbce 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserCorpInfoDO.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserCorpInfoDO.java
@@ -24,7 +24,7 @@ public class UserCorpInfoDO implements Serializable {
 
     //企业名称
     @ApiModelProperty(value = "企业名称")
-    private String corpinfoName;
+    private String corpName;
 
     //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
     @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)")
diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
index 0ebf8368..23193c67 100644
--- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
@@ -344,10 +344,10 @@
 
     </select>
     <select id="getListByUserIds" resultType="com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO">
-        select u.id as userId, ci.corp_name as corpinfoName,ci.id as corpinfoId
+        select u.id as userId, ci.corp_name as corpName,ci.id as corpinfoId
         from user u
         left join corp_info ci on u.corpinfo_id = ci.id
-        where u.user_id in
+        where u.id in
         <foreach collection="userIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>