From de69ca922568e3498c15a9b264d86ddb3d5b892e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Fri, 5 Dec 2025 19:21:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=A7=92=E8=89=B2=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs
index 38093ba..d6bc884 100644
--- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs
+++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs
@@ -773,7 +773,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                         personTeam = teamPersons;
                         if (entity.APPROVE_ROLE_ID != null)
                         {
-                            var isExist = userList.FirstOrDefault(t => t.APPROVE_ROLE_ID == entity.APPROVE_ROLE_ID && t.DEPARTMENT_ID == entity.DEPARTMENT_ID);
+                            var isExist = userList.FirstOrDefault(t => t.APPROVE_ROLE_ID == entity.APPROVE_ROLE_ID && t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.ENABLE_STATUS == 0);
                             if (isExist != null)
                                 this.ThrowError("070001");
                         }
@@ -1433,6 +1433,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                 else
                 {
                     user.ENABLE_STATUS = 1;
+                    user.APPROVE_ROLE_ID = null;
                 }
                 T_FM_TEAM_PERSON teamPerson = new T_FM_TEAM_PERSON();
                 if (user.ENABLE_STATUS == 0 && department.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)