소스 검색

影藏个人用户身份认证成功后的测评机构信息

guochao 5 년 전
부모
커밋
b6ae8dc6bf

+ 13 - 4
site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -11,8 +11,10 @@ import com.mooctest.crowd.domain.model.CrowdTestTaskPO;
 import com.mooctest.crowd.domain.model.EvaluationAgencyPO;
 import com.mooctest.crowd.domain.model.UserPO;
 import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
+import com.mooctest.crowd.domain.repository.EvaluationAgencyRepo;
 import com.mooctest.crowd.domain.repository.UserRepo;
-import com.mooctest.crowd.site.command.*;
+import com.mooctest.crowd.site.command.LoginCommand;
+import com.mooctest.crowd.site.command.RegisterCommand;
 import com.mooctest.crowd.site.data.ProjectOperationControl;
 import com.mooctest.crowd.site.data.TaskOperationControl;
 import com.mooctest.crowd.site.data.dto.*;
@@ -21,11 +23,11 @@ import com.mooctest.crowd.site.mediator.ViewMediator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.List;
+
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -44,6 +46,9 @@ public class WebMediatorImpl implements ViewMediator {
     private UserRepo userRepo;
 
     @Autowired
+    private EvaluationAgencyRepo evaluationAgencyRepo;
+
+    @Autowired
     private CrowdTestTaskDao taskDao;
 
     @Autowired
@@ -67,6 +72,9 @@ public class WebMediatorImpl implements ViewMediator {
     @Autowired
     private EnterpriseAuthenticationDao enterpriseAuthenticationDao;
 
+    @Value("${agency}")
+    private String agencyId;
+
     @Override
     public UserDTO loginByMobileAndPwd(LoginCommand cmd) {
         return null;
@@ -351,13 +359,14 @@ public class WebMediatorImpl implements ViewMediator {
     @Override
     public List<EvolutionAgencyVO> renderAgencyList() {
         List<EvolutionAgencyVO> agencyList = new ArrayList<>();
+        EvaluationAgency agencyTemplate = evaluationAgencyRepo.findAgencyById(Long.parseLong(agencyId));
         agencyDao.findAll().forEach(evaluationAgencyPO -> {
             EvolutionAgencyVO agencyVO = new EvolutionAgencyVO();
             agencyVO.setId(evaluationAgencyPO.getUserId());
             agencyVO.setName(evaluationAgencyPO.getEvaluationAgencyName());
             agencyList.add(agencyVO);
         });
-        return agencyList;
+        return agencyList.stream().filter(agency -> !agency.getName().equals(agencyTemplate.getEvaluationAgencyName())).collect(Collectors.toList());
     }
 
     @Override

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
site/src/main/java/com/mooctest/crowd/site/service/impl/UserServiceImpl.java


+ 2 - 0
site/src/main/resources/application.yml

@@ -54,6 +54,8 @@ oss:
 #user:
 #  service:
 #    baseUrl: http://111.231.143.6:8081
+
+agency: 7
 ---
 spring:
   profiles: dev

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.