Merge branch 'Dev' into 'Test'

Dev

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

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -682,6 +682,7 @@ public class WebMediatorImpl implements ViewMediator {
                             }
                             return null;
                         }).collect(Collectors.toList());
+
                 unfinishedTasks = allTaskOfAgency.stream()
                         .filter(crowdTestTask -> crowdTestTask.getStatus() >= CrowdTestTaskStatus.HAS_RELEASED && crowdTestTask.getStatus() < CrowdTestTaskStatus.HAS_FINISHED)
                         .collect(Collectors.toList());
@@ -1184,9 +1185,9 @@ public class WebMediatorImpl implements ViewMediator {
     @Override
     public UserDTO updateInformation(long userId, UserVO userVO) {
         Optional<UserPO> userPO = userDao.findById(userId);
-        if (userVO.getUnit() == null || userVO.getUnit().length() <= 0) {
-            throw new HttpBadRequestException("请输入企业简称");
-        }
+//        if (userVO.getUnit() == null || userVO.getUnit().length() <= 0) {
+//            throw new HttpBadRequestException("请输入企业简称");
+//        }
         userPO.get().setPhotoUrl(userVO.getPhotoUrl());
         userPO.get().setUnit(userVO.getUnit());
         userPO.get().setGender(userVO.getGender());

site/src/main/java/com/mooctest/crowd/site/service/CommonService.java

@@ -47,4 +47,5 @@ public interface CommonService {
     ExpertVO getExpert(Long id);
 
     DataDTO getAllData();
+
 }

site/src/main/java/com/mooctest/crowd/site/service/ThemeStatusService.java

@@ -1,6 +1,5 @@
 package com.mooctest.crowd.site.service;
 import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
-import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
 
 
 public interface ThemeStatusService {