diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java index d88d4f2..a6e3a3a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java @@ -119,6 +119,9 @@ public class CountryRegionServiceImpl extends ServiceImpl child(Long pid, String excludeType, String keyword, String startPCode) { List pidList = CollectionUtils.newArrayList(); + if(pid == null) { + pid = 0L; + } if(StrUtil.isNotBlank(startPCode) && (pid == null || pid ==0) ){ List pList = this.list(Wrappers.query() diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java index 593c938..70a2566 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java @@ -152,8 +152,6 @@ public class CustomerController { @Override public UpdateLngCustomerDto before(DataOperationContent content) { - String code = codeRuleClient.genEncode(CUSTOMER_CODE); - dto.setCuCode("C"+code); return content.getObj(); } @@ -163,7 +161,6 @@ public class CustomerController { if (StringUtils.isNotEmpty(msg)) { throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); } - codeRuleClient.useEncode(CUSTOMER_CODE); return content.getObj(); } })); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java index 8098433..2e798b8 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java @@ -82,7 +82,7 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl