|
|
@@ -562,6 +562,9 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
|
|
|
//获取部门信息
|
|
|
SysDept sysDept = new SysDept();
|
|
|
SysDept sysDept2 = sysDeptMapper.selectByusci(usci);
|
|
|
+ if (sysDept2==null){
|
|
|
+ throw new ServiceException("打卡系统公司不存在");
|
|
|
+ }
|
|
|
sysDept.setAncestors(sysDept2.getDeptId().toString());
|
|
|
List<SysDept> sysDepts = sysDeptMapper.selectDeptList(sysDept);
|
|
|
sysDepts.stream().forEach(System.out::println);
|
|
|
@@ -574,6 +577,9 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
|
|
|
sysUsers.stream().forEach(sysUser -> {
|
|
|
projectTasks.addAll(projectTaskMapper.selectByUserId(sysUser.getUserId()));
|
|
|
});
|
|
|
+ if (projectTasks.isEmpty()||sysUsers.isEmpty()||sysDepts.isEmpty()){
|
|
|
+ throw new ServiceException("打卡数据不存在");
|
|
|
+ }
|
|
|
Map<String,Object> map=new HashMap();
|
|
|
map.put("projectTasks",projectTasks);
|
|
|
map.put("sysUsers",sysUsers);
|