Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java

@@ -152,12 +152,20 @@ public class UserManageServiceImpl implements UserManageService {
                 user.setRoles(roles);
                 UserVo userVo = new UserVo(user);
                 if(pageRequest.getStartTime()==null&&pageRequest.getEndTime()==null){
+
                     UserWorkData userWorkData = userWorkDataMap.get(user.getId());
+                    if(userWorkData!=null){
                         userVo.setAverageScore(userWorkData.getAverageScore());
                         userVo.setCompletedCount(userWorkData.getCompletedNum());
                         userVo.setWorkingCount(userWorkData.getUnCompletedNum());
+                    }
                 }else{
-                    internalService.personnelWorkMsg(user.getId(),pageRequest.getStartTime(),pageRequest.getEndTime());
+                    UserWorkData userWorkData = internalService.personnelWorkMsg(user.getId(), pageRequest.getStartTime(), pageRequest.getEndTime());
+                    if(userWorkData!=null){
+                        userVo.setAverageScore(userWorkData.getAverageScore());
+                        userVo.setCompletedCount(userWorkData.getCompletedNum());
+                        userVo.setWorkingCount(userWorkData.getUnCompletedNum());
+                    }
                 }
                 userVos.add(userVo);
             }
@@ -177,10 +185,19 @@ public class UserManageServiceImpl implements UserManageService {
                 UserVo userVo = new UserVo(user);
                 if(pageRequest.getStartTime()==null&&pageRequest.getEndTime()==null){
                     UserWorkData userWorkData = userWorkDataMap.get(user.getId());
+                    if(userWorkData!=null){
+                        userVo.setAverageScore(userWorkData.getAverageScore());
+                        userVo.setCompletedCount(userWorkData.getCompletedNum());
+                        userVo.setWorkingCount(userWorkData.getUnCompletedNum());
+                    }
+                }else{
+                    UserWorkData userWorkData = internalService.personnelWorkMsg(user.getId(), pageRequest.getStartTime(), pageRequest.getEndTime());
+                    if(userWorkData!=null){
                         userVo.setAverageScore(userWorkData.getAverageScore());
                         userVo.setCompletedCount(userWorkData.getCompletedNum());
                         userVo.setWorkingCount(userWorkData.getUnCompletedNum());
                     }
+                }
                 userVos.add(userVo);
             }
             pageResponse.setRows(userVos);