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)