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-09-24 13:16:18 +08:00
parent 7f1971248a
commit a177ab3067
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -706,6 +706,7 @@ public class SubUserSalaryDetailServiceImpl extends ServiceImpl<SubUserSalaryDet
wrapper.eq( dto.getTeamId()!=null,SubUserSalaryDetail::getTeamId, dto.getTeamId()); wrapper.eq( dto.getTeamId()!=null,SubUserSalaryDetail::getTeamId, dto.getTeamId());
wrapper.eq(dto.getUserId()!=null,SubUserSalaryDetail::getUserId, dto.getUserId()); wrapper.eq(dto.getUserId()!=null,SubUserSalaryDetail::getUserId, dto.getUserId());
wrapper.between(SubUserSalaryDetail::getReportDate,start, end); wrapper.between(SubUserSalaryDetail::getReportDate,start, end);
wrapper.orderByAsc(SubUserSalaryDetail::getReportDate);
return this.list(wrapper); return this.list(wrapper);
} }

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesUserServiceImpl.java
View File

@ -167,8 +167,14 @@ public class DesUserServiceImpl extends ServiceImpl<DesUserMapper, DesUser> impl
List<DesUser> desUsers = MapstructUtils.convert(dto.getList(), DesUser.class); List<DesUser> desUsers = MapstructUtils.convert(dto.getList(), DesUser.class);
roleService.deleteDesignUser(dto.getProjectId()); roleService.deleteDesignUser(dto.getProjectId());
ArrayList<String> userIds = new ArrayList<>();
List<SysUserRole> sysUserRoles = new ArrayList<>(); List<SysUserRole> sysUserRoles = new ArrayList<>();
for (DesUserBo bo : dto.getList()) { for (DesUserBo bo : dto.getList()) {
if(bo.getUserId()==null){
continue;
}
SysUserRole sysUserRole = new SysUserRole(); SysUserRole sysUserRole = new SysUserRole();
if("3".equals(bo.getUserType())){ if("3".equals(bo.getUserType())){
sysUserRole.setRoleId(1961314792461586433L); sysUserRole.setRoleId(1961314792461586433L);
@ -176,10 +182,16 @@ public class DesUserServiceImpl extends ServiceImpl<DesUserMapper, DesUser> impl
sysUserRole.setRoleId(1961315028017893378L); sysUserRole.setRoleId(1961315028017893378L);
}else if("4".equals(bo.getUserType())){ }else if("4".equals(bo.getUserType())){
sysUserRole.setRoleId(1961315147199041537L); sysUserRole.setRoleId(1961315147199041537L);
}else {
continue;
} }
sysUserRole.setUserId(bo.getUserId()); sysUserRole.setUserId(bo.getUserId());
sysUserRole.setProjectId(dto.getProjectId()); sysUserRole.setProjectId(dto.getProjectId());
if(userIds.contains(sysUserRole.getUserId()+"-"+sysUserRole.getRoleId())){
continue;
}
sysUserRoles.add(sysUserRole); sysUserRoles.add(sysUserRole);
userIds.add(sysUserRole.getUserId()+"-"+sysUserRole.getRoleId());
} }
roleService.insertUserRoleBatch(sysUserRoles); roleService.insertUserRoleBatch(sysUserRoles);
//todo:发消息 //todo:发消息