已有专题列表优化

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/QuerySpecialSubFormDTO.java

@@ -34,4 +34,8 @@ public class QuerySpecialSubFormDTO implements Serializable {
      * 当前登录用户userId,
      */
     private String userId;
+    /**
+     * 当前登录用户客户id
+     */
+    private String customerId;
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java

@@ -95,6 +95,7 @@ public class SpecialSubjectController {
     @PostMapping("existedlist")
     public Result<List<WorkSpecialSubjectResultDTO>> queryExistedList(@LoginUser TokenDto tokenDto, @RequestBody QuerySpecialSubFormDTO formDTO) {
         formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(formDTO, QuerySpecialSubFormDTO.AddUserInternalGroup.class);
         return new Result<List<WorkSpecialSubjectResultDTO>>().ok(specialSubjectService.queryExistedList(formDTO));
     }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java

@@ -156,6 +156,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
         SpecialSubjectEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, SpecialSubjectEntity.class);
         StaffInfoFromDTO staffInfoFromDTO = new StaffInfoFromDTO();
         staffInfoFromDTO.setStaffId(formDTO.getAddUserId());
+        staffInfoFromDTO.setCustomerId(formDTO.getCustomerId());
         Result<MineResultDTO> result = govOrgOpenFeignClient.queryStaffProfile(staffInfoFromDTO);
         if(result.success()&&null!=result.getData()){
             insertEntity.setAddUserAgencyId(result.getData().getAgencyId());
@@ -200,6 +201,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
     public List<WorkSpecialSubjectResultDTO> queryExistedList(QuerySpecialSubFormDTO formDTO) {
         StaffInfoFromDTO staffInfoFromDTO = new StaffInfoFromDTO();
         staffInfoFromDTO.setStaffId(formDTO.getUserId());
+        staffInfoFromDTO.setCustomerId(formDTO.getCustomerId());
         Result<MineResultDTO> staffResult = govOrgOpenFeignClient.queryStaffProfile(staffInfoFromDTO);
         if (!staffResult.success() && null == staffResult.getData()) {
             throw new RenException("查询当前工作人员信息异常");