diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java index 0775483d..0dd35fdd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java @@ -4,10 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; @@ -16,6 +13,7 @@ import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.BussinessOriginTypeService; import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; @@ -41,6 +39,8 @@ public class BussinessOriginTypeController { private BussinessOriginTypeService bussinessOriginTypeService; @Resource ErpBasicClient erpBasicClient; + @Resource + private BasicThirdSysService basicThirdSysService; @AuthRuleAnnotation("") @GetMapping("/udiwms/originBusType/filter") @@ -50,8 +50,10 @@ public class BussinessOriginTypeController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - - if (StrUtil.isEmpty(bussinessTypeFilterRequest.getThirdSys())) { + if (bussinessTypeFilterRequest.isOnlyMain()) { + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + bussinessTypeFilterRequest.setThirdSys(basicThirdSysEntity.getThirdId()); + } else if (StrUtil.isEmpty(bussinessTypeFilterRequest.getThirdSys())) { return ResultVOUtils.error(500, "请先选择第三系统"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java index 75441be3..166093c4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java @@ -16,4 +16,5 @@ public class BussinessOriginTypeFilterRequest extends ListPageRequest { private String lastUpdateTime; private Integer corpType; private String key; + private boolean onlyMain; }