From e40e1092e5f644180a3c781919f9edb7b1497840 Mon Sep 17 00:00:00 2001 From: "lj7788@126.com" Date: Sat, 11 Jan 2025 20:31:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E6=BF=80=E6=B4=BB=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...roProjectInfoSubdeptsUsersServiceImpl.java | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) 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 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);