lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
zt
2025-12-24 09:43:07 +08:00
parent fa869173e3
commit be73961530
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java
View File

@ -284,7 +284,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
sysUserBo.setUserId(sysUserId);
sysUserBo.setDeptId(dto.getDeptId());
sysUserBo.setContractorId(dto.getContractorId());
userService.updateUser(sysUserBo);
userService.updateUserInfo(sysUserBo);
//人员与班组关联表
BusProjectTeamMember projectTeamMember = new BusProjectTeamMember();
@ -1474,7 +1474,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
sysUserBo.setUserId(userId);
sysUserBo.setNickName(user.getUserName());
sysUserBo.setSex(user.getSex());
userService.updateUser(sysUserBo);
userService.updateUserInfo(sysUserBo);
return user.getId();
}

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java
View File

@ -321,4 +321,12 @@ public interface ISysUserService {
void deleteContractorIdByUserId(Long userId);
/**
* 修改用户信息
*
* @param user 用户信息
* @return 结果
*/
void updateUserInfo(SysUserBo user);
}

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
View File

@ -537,7 +537,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
public int updateUser(SysUserBo user) {
SysUser sysUser1 = baseMapper.selectById(user.getUserId());
String appUserType = sysUser1.getAppUserType();
if("0".equals(appUserType) || "2".equals(appUserType)){
if(("0".equals(appUserType) || "2".equals(appUserType))
&& CollectionUtil.isNotEmpty(user.getProjectRoles())){
int size = user.getProjectRoles().size();
if(size > 1){
throw new ServiceException("分包和施工只能关联一个项目");
@ -1600,5 +1601,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
}
@Override
public void updateUserInfo(SysUserBo user) {
SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
baseMapper.updateById(sysUser);
}
}