geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug#796

Browse Source
This commit is contained in:
shunyi.kuang
2025-12-15 15:05:32 +08:00
parent 8c9dcae89e
commit a5a53d956a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java
View File

@ -119,6 +119,9 @@ public class CountryRegionServiceImpl extends ServiceImpl<LngBRegionMapper, LngB
@Override @Override
public List<LngBRegionVo> child(Long pid, String excludeType, String keyword, String startPCode) { public List<LngBRegionVo> child(Long pid, String excludeType, String keyword, String startPCode) {
List<Long> pidList = CollectionUtils.newArrayList(); List<Long> pidList = CollectionUtils.newArrayList();
if(pid == null) {
pid = 0L;
}
if(StrUtil.isNotBlank(startPCode) && (pid == null || pid ==0) ){ if(StrUtil.isNotBlank(startPCode) && (pid == null || pid ==0) ){
List<LngBRegion> pList = this.list(Wrappers.<LngBRegion>query() List<LngBRegion> pList = this.list(Wrappers.<LngBRegion>query()

3
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java
View File

@ -152,8 +152,6 @@ public class CustomerController {
@Override @Override
public UpdateLngCustomerDto before(DataOperationContent<UpdateLngCustomerDto> content) { public UpdateLngCustomerDto before(DataOperationContent<UpdateLngCustomerDto> content) {
String code = codeRuleClient.genEncode(CUSTOMER_CODE);
dto.setCuCode("C"+code);
return content.getObj(); return content.getObj();
} }
@ -163,7 +161,6 @@ public class CustomerController {
if (StringUtils.isNotEmpty(msg)) { if (StringUtils.isNotEmpty(msg)) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
} }
codeRuleClient.useEncode(CUSTOMER_CODE);
return content.getObj(); return content.getObj();
} }
})); }));