单位服务查询

src/main/java/com/mmc/pms/controller/inspection/CompanyInspectionController.java

@@ -88,8 +88,8 @@ public class CompanyInspectionController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CompanyInspectionDTO.class)})
     @PostMapping("listAPPCompanyInspectionPage")
     public ResultBody<IndustryTypeDTO> listAPPCompanyInspectionPage(@Validated(value = {Page.class})
-                                                                      @RequestBody CompanyInspectionQO companyInspectionQO, HttpServletRequest request){
-        return companyInspectionService.listAPPCompanyInspectionPage(companyInspectionQO, this.getUserLoginInfoFromRedis(request));
+                                                                      @RequestBody CompanyInspectionQO companyInspectionQO){
+        return companyInspectionService.listAPPCompanyInspectionPage(companyInspectionQO);
     }
 
     @ApiOperation(value = "批量-根据公司id查询服务")

src/main/java/com/mmc/pms/service/inspection/CompanyInspectionService.java

@@ -29,7 +29,7 @@ public interface CompanyInspectionService {
 
     ResultBody listInspectionPriceUnit();
 
-    ResultBody<IndustryTypeDTO> listAPPCompanyInspectionPage(CompanyInspectionQO companyInspectionQO, LoginSuccessDTO loginSuccessDTO);
+    ResultBody<IndustryTypeDTO> listAPPCompanyInspectionPage(CompanyInspectionQO companyInspectionQO);
 
     void removeCompanyInspectionByCompanyInfoId(Integer companyInfoId);
 

src/main/java/com/mmc/pms/service/inspection/impl/CompanyInspectionServiceImpl.java

@@ -113,7 +113,7 @@ public class CompanyInspectionServiceImpl implements CompanyInspectionService {
         List<CompanyInspectionDO> companyInspectionDOS = companyInspectionDao.listCompanyInspectionPage(companyInspectionQO);
         List<CompanyInspectionDTO> companyInspectionDTOS = companyInspectionDOS.stream().map(CompanyInspectionDO::buildCompanyInspectionDTO).collect(Collectors.toList());
         // 设置单位名称
-        setCompanyName(companyInspectionDTOS, loginSuccessDTO.getToken());
+        setCompanyName(companyInspectionDTOS);
         return ResultBody.success(PageResult.buildPage(pageNo, companyInspectionQO.getPageSize(), count, companyInspectionDTOS));
     }
 
@@ -136,7 +136,7 @@ public class CompanyInspectionServiceImpl implements CompanyInspectionService {
     }
 
     @Override
-    public ResultBody<IndustryTypeDTO> listAPPCompanyInspectionPage(CompanyInspectionQO companyInspectionQO, LoginSuccessDTO loginSuccessDTO) {
+    public ResultBody<IndustryTypeDTO> listAPPCompanyInspectionPage(CompanyInspectionQO companyInspectionQO) {
         int count = companyInspectionDao.countListAPPCompanyInspectionPage(companyInspectionQO);
         if (count == 0) {
             return ResultBody.success(PageResult.buildPage(companyInspectionQO.getPageNo(), companyInspectionQO.getPageSize(), count));
@@ -145,7 +145,7 @@ public class CompanyInspectionServiceImpl implements CompanyInspectionService {
         companyInspectionQO.buildCurrentPage();
         List<CompanyInspectionDO> companyInspectionDOS = companyInspectionDao.listAPPCompanyInspectionPage(companyInspectionQO);
         List<CompanyInspectionDTO> companyInspectionDTOS = companyInspectionDOS.stream().map(CompanyInspectionDO::buildCompanyInspectionDTO).collect(Collectors.toList());
-        setCompanyName(companyInspectionDTOS, loginSuccessDTO.getToken());
+        setCompanyName(companyInspectionDTOS);
         return ResultBody.success(PageResult.buildPage(pageNo, companyInspectionQO.getPageSize(), count, companyInspectionDTOS));
     }
 
@@ -171,10 +171,10 @@ public class CompanyInspectionServiceImpl implements CompanyInspectionService {
         return ResultBody.success(companyInspectionDTOS);
     }
 
-    public void setCompanyName(List<CompanyInspectionDTO> companyInspectionDTOS, String token){
+    public void setCompanyName(List<CompanyInspectionDTO> companyInspectionDTOS){
         // 单位名称查询
         List<Integer> companyInfoIds = companyInspectionDTOS.stream().map(i -> i.getCompanyInfoId()).collect(Collectors.toList());
-        List<CompanyInfoVO> companyInfoVOS = userAppApi.feignListCompanyInfoByIds(companyInfoIds, token);
+        List<CompanyInfoVO> companyInfoVOS = userAppApi.feignListCompanyInfoByIds(companyInfoIds, null);
         if (CollectionUtils.isNotEmpty(companyInfoVOS)){
             Map<Integer, String> collect = companyInfoVOS.stream().collect(Collectors.toMap(CompanyInfoVO::getId, CompanyInfoVO::getCompanyName));
             companyInspectionDTOS.stream().forEach(i -> i.setCompanyName(collect.get(i.getCompanyInfoId())));