v20201123v1.5

mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java

@@ -440,9 +440,9 @@ public class CompeteTaskService implements ICompeteTaskService {
                         }
                     } else {
                         int a = projectJudgment.getSiteList().size();
-                        System.out.println("==========="+ a);
+//                        System.out.println("==========="+ a);
-                        System.out.println("==========="+ projectJudgment.getSiteNums());
+//                        System.out.println("==========="+ projectJudgment.getSiteNums());
-                        System.out.println("==========="+ (projectJudgment.getSiteNums()-a));
+//                        System.out.println("==========="+ (projectJudgment.getSiteNums()-a));
                         for (int j = 0; j < projectJudgment.getSiteNums() - a; j++) {
                             ProvinceCompeteVo.ProjectSite siteJudgment = new ProvinceCompeteVo.ProjectSite();
                             siteJudgment.setSiteNum(a + j + 1);
@@ -561,7 +561,9 @@ public class CompeteTaskService implements ICompeteTaskService {
             }
             if(roleJsonResponse.getCode() == 200){
                 MemberVo.Member member = memberJsonResponse.getData();
-                userId = member.getUserId();
+                if(ObjectUtil.isNotNull(member)){
+                    userId = member.getUserId();
+                }
             }
             //code等于21代表成员已存在
             if (memberJsonResponse.getCode() == 21) {