合并分支 'gwj' 到 'master'

notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java

@@ -48,6 +48,7 @@ public class UnionApplication {
         connector.setPort(8084);
         connector.setRedirectPort(8289);
         return connector;
+
     }
 
 }

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());
-                    userVo.setAverageScore(userWorkData.getAverageScore());
-                    userVo.setCompletedCount(userWorkData.getCompletedNum());
-                    userVo.setWorkingCount(userWorkData.getUnCompletedNum());
+                    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,9 +185,18 @@ public class UserManageServiceImpl implements UserManageService {
                 UserVo userVo = new UserVo(user);
                 if(pageRequest.getStartTime()==null&&pageRequest.getEndTime()==null){
                     UserWorkData userWorkData = userWorkDataMap.get(user.getId());
-                    userVo.setAverageScore(userWorkData.getAverageScore());
-                    userVo.setCompletedCount(userWorkData.getCompletedNum());
-                    userVo.setWorkingCount(userWorkData.getUnCompletedNum());
+                    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);
             }