dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:e95320be7fe38972e5990788f98682cbe57fcf66
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev
...
compare: dianliang:0205bedce10f00729f0361bead84a4074ed75b5d
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev

3 Commits
e95320be7f ... 0205bedce1

Author SHA1 Message Date
许允枞
0205bedce1 更新 2024-11-14 10:20:43 +08:00
许允枞
8ff6bfb8e5 Merge branch 'dev' 
# Conflicts:
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
 2024-11-14 10:20:27 +08:00
许允枞
5179cbb013 更新 2024-11-14 10:19:16 +08:00
1 changed files with 1 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
View File

@ -248,7 +248,7 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
//根据角色id获取所有用户
List<UserDTO> listByUserId = roleService.getListByUserId(roleId);
List<Long> ids = listByUserId.stream().map(UserDTO::getId).collect(Collectors.toList());
if (ObjectUtil.isNull(inspectionInfo.getLeadManId())) {
if (ObjectUtil.isNotNull(inspectionInfo.getLeadManId())) {
ids.add(inspectionInfo.getLeadManId());
}
// 获取当前共单引车员的id