diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java index 0bd57c58..942643fe 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java @@ -78,10 +78,6 @@ public class AppEnterpriseComplaintController extends BaseController { @GetMapping("/listNotComplaint") public TableDataInfo listNotComplaint(@ModelAttribute AppEnterpriseComplaintBo bo, PageQuery pageQuery) { // 校验企业信用代码 - if (StringUtils.isBlank(bo.getEnterpriseNumber())) { - throw new IllegalArgumentException("企业信用代码不能为空"); - } - TableDataInfo list = appEnterpriseComplaintService.getAllCheckList(bo, pageQuery); return list; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseComplaintBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseComplaintBo.java index 3d8af835..67a55a34 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseComplaintBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseComplaintBo.java @@ -26,7 +26,6 @@ public class AppEnterpriseComplaintBo extends BaseEntity { /** * 主键ID */ - @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) private String id; /** diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java index 6a21ffbe..44672a0a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java @@ -15,6 +15,7 @@ import com.zdxt.enforcementcode.domain.bo.MssqOrderFlowBo; import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseComplaintBo; import com.zdxt.enforcementcode.domain.vo.ZdxtFileVo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo; +import com.zdxt.enforcementcode.mapper.EnterpriseInformationMapper; import com.zdxt.enforcementcode.mapper.ZdxtFileMapper; import com.zdxt.enforcementcode.mapper.enterprise.AppEnforcementRegistrationMapper; import com.zdxt.enforcementcode.mapper.enterprise.AppEnterpriseComplaintMapper; @@ -68,6 +69,9 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain @Autowired private IMssqApiService mssqApiService; + @Autowired + private EnterpriseInformationMapper enterpriseInformationMapper; + /** * 企业端-投诉建议详情 * @@ -198,6 +202,19 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain */ @Override public TableDataInfo getAllCheckList(AppEnterpriseComplaintBo bo, PageQuery pageQuery) { + + //根据部门查询 企业统一社会信用代码 + String deptId=LoginHelper.getDeptId(); + + + //enterprise_information + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(EnterpriseInformation::getDeptId, deptId); + EnterpriseInformation enterpriseInformation = enterpriseInformationMapper.selectOne(lqw); + if(enterpriseInformation == null){ + return TableDataInfo.build(); + } + bo.setEnterpriseNumber(enterpriseInformation.getEnterpriseNumber()); // 1. 调用 setDept() 处理部门过滤(从投诉事项编码提取信用代码查部门) List deptList = setDept(bo.getComplaintItemCodes());