|
@@ -955,17 +955,19 @@ public class LabSubjectServiceImpl implements ILabSubjectService {
|
|
|
userPhoneInfo.setRole("实验室负责人");
|
|
userPhoneInfo.setRole("实验室负责人");
|
|
|
userPhoneInfoList.add(userPhoneInfo);
|
|
userPhoneInfoList.add(userPhoneInfo);
|
|
|
}
|
|
}
|
|
|
- String[] split = labSubject.getSafeUserId().split(",");
|
|
|
|
|
- if(split != null && split.length >0){
|
|
|
|
|
- for (String userId : split) {
|
|
|
|
|
- R<SysUser> userR = userService.getUserInfoByUserId(Long.valueOf(userId), SecurityConstants.INNER);
|
|
|
|
|
- if (HttpStatus.SUCCESS == userR.getCode()) {
|
|
|
|
|
- SysUser user = userR.getData();
|
|
|
|
|
- UserPhoneInfo userPhoneInfo1 = new UserPhoneInfo();
|
|
|
|
|
- userPhoneInfo1.setPhone(user.getPhonenumber());
|
|
|
|
|
- userPhoneInfo1.setNickName(user.getNickName());
|
|
|
|
|
- userPhoneInfo1.setRole("安全责任人");
|
|
|
|
|
- userPhoneInfoList.add(userPhoneInfo1);
|
|
|
|
|
|
|
+ if (!labSubject.getSafeUserId().isEmpty()) {
|
|
|
|
|
+ String[] split = labSubject.getSafeUserId().split(",");
|
|
|
|
|
+ if(split != null && split.length >0){
|
|
|
|
|
+ for (String userId : split) {
|
|
|
|
|
+ R<SysUser> userR = userService.getUserInfoByUserId(Long.valueOf(userId), SecurityConstants.INNER);
|
|
|
|
|
+ if (HttpStatus.SUCCESS == userR.getCode()) {
|
|
|
|
|
+ SysUser user = userR.getData();
|
|
|
|
|
+ UserPhoneInfo userPhoneInfo1 = new UserPhoneInfo();
|
|
|
|
|
+ userPhoneInfo1.setPhone(user.getPhonenumber());
|
|
|
|
|
+ userPhoneInfo1.setNickName(user.getNickName());
|
|
|
|
|
+ userPhoneInfo1.setRole("安全责任人");
|
|
|
|
|
+ userPhoneInfoList.add(userPhoneInfo1);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|