diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
index 000b2f34..03d845ba 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
@@ -857,13 +857,32 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
             proProjectInfoSubdeptsUsers.setSortBy(0L);
             res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);
         }
+        boolean isAdmin= (SecurityUtils.isAdmin(SecurityUtils.getUserId()) || SecurityUtils.isGSAdmin());
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        SysUserExt userExt = new SysUserExt();
-        userExt.setUserId(loginUser.getUserid());
-        userExt.setComId(loginUser.getSysUser().getComId());
-        userExt.setProjectId(id);
-        sysUserExtMapper.clearAllActive(userExt);//清除所有激活状态
-        sysUserExtMapper.setActive(userExt);//设置激活状态
+        if(isAdmin){
+            SysUserExt userExt = new SysUserExt();
+            userExt.setUserId(loginUser.getUserid());
+            userExt.setComId(loginUser.getSysUser().getComId());
+            List<SysUserExt> userExts=sysUserExtMapper.selectSysUserExtList(userExt);
+            if(userExts.size()>0){
+                SysUserExt oldExt = userExts.get(0);
+                oldExt.setProjectId(id);
+                oldExt.setIsActive(1l);
+                sysUserExtMapper.updateSysUserExt(oldExt);
+            }else{
+                userExt.setProjectId(id);
+                userExt.setStatus("0");
+                userExt.setIsActive(1l);
+                sysUserExtMapper.insertSysUserExt(userExt);
+            }
+        }else {
+            SysUserExt userExt = new SysUserExt();
+            userExt.setUserId(loginUser.getUserid());
+            userExt.setComId(loginUser.getSysUser().getComId());
+            userExt.setProjectId(id);
+            sysUserExtMapper.clearAllActive(userExt);//清除所有激活状态
+            sysUserExtMapper.setActive(userExt);//设置激活状态
+        }
         SysUser oldUser=sysUserMapper.selectUserByUserId(loginUser.getUserid());
         oldUser.setDeptId(id);
         sysUserMapper.updateUser(oldUser);