Merge branch 'feature-V2.0' into 'master'

修复新建任务时任务code的类型为null

See merge request crowd-2019/crowd-test-service-backend!154

core/src/main/java/com/mooctest/crowd/domain/repository/UserRepo.java

@@ -13,10 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Author: xuexb
@@ -261,6 +259,8 @@ public class UserRepo implements IUserRepo {
     private User saveRoleAndPermissionAndEvaluationAgencyByUser(User user) throws RoleNotFoundException {
         UserPO userPO = userDao.save(Converter.convert(UserPO.class, user));
         List<Role> roleList = user.getRoleList();
+        Map<Long, String> collect = roleList.stream().collect(Collectors.toMap(Role::getId, Role::getName, (v1,v2) -> v2));
+
         if (roleList == null || roleList.size() == 0) {
             UserToRolePO u2r = new UserToRolePO();
             u2r.setUserId(userPO.getId());

site/src/main/java/com/mooctest/crowd/site/data/enums/ProjectType.java

@@ -20,7 +20,9 @@ public enum ProjectType {
     FXPG("FXPG", "风险评估", 11),
     DBCP("DBCP", "等保测评", 12),
     PGPJ("PGPJ", "评估评价", 13),
-    DZCS("DZCS", "定制测试", 14);
+    DZCS("DZCS", "定制测试", 14),
+    BDSPT("BDSPT", "北斗众测", 15),
+    MCZC("MCZC", "慕测众测", 16);
 
     private String typeCode;
     private String typeName;
@@ -53,7 +55,7 @@ public enum ProjectType {
 
     public static String getCode(String typeName) {
         for (ProjectType pt : ProjectType.values()) {
-            if (pt.getTypeName().equals(typeName)) {
+            if (pt.getTypeCode().equals(typeName)) {
                 return pt.getTypeCode();
             }
         }