Merge branch 'Dev' into 'Test'

Dev

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

site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdProjectServiceImpl.java

@@ -390,14 +390,15 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
                 // 对用户判断认证类型 测评机构为2 测试人员为6
                 Optional<UserTaskCountPO> userTaskCountPOOptional = userTaskCountDao.findByUserId(user.getId());
                 if (!userTaskCountPOOptional.isPresent()) {
-                    Long roleType = 2L;
                     if (user.getRoleList().stream().anyMatch(role -> role.getName().equals(RoleType.EVALUATION_USER.getName()))) {
-                        roleType = RoleType.EVALUATION_USER.getId();
+                        Long roleType = RoleType.EVALUATION_USER.getId();
+                        UserTaskCount userTaskCount = new UserTaskCount(user.getId(), 1L, roleType);
+                        userTaskCountDao.save(Converter.convert(UserTaskCountPO.class, userTaskCount));
                     } else if (user.getRoleList().stream().anyMatch(role -> role.getName().equals(RoleType.AGENCY.getName()))) {
-                        roleType = RoleType.AGENCY.getId();
+                        Long roleType = RoleType.AGENCY.getId();
+                        UserTaskCount userTaskCount = new UserTaskCount(user.getId(), 1L, roleType);
+                        userTaskCountDao.save(Converter.convert(UserTaskCountPO.class, userTaskCount));
                     }
-                    UserTaskCount userTaskCount = new UserTaskCount(user.getId(), 1L, roleType);
-                    userTaskCountDao.save(Converter.convert(UserTaskCountPO.class, userTaskCount));
                 } else {
                     UserTaskCountPO userTaskCountPO = userTaskCountPOOptional.get();
                     userTaskCountPO.setCount(userTaskCountPO.getCount() + 1);