lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: lcj:5f3ae0f9f107a142f438ff9fadf0010d6b263fec
Branches Tags
lcj:dev lcj:prod
...
compare: lcj:f00b98714a9cb573d29d6d7256555e1b836e8534
Branches Tags
lcj:dev lcj:prod

2 Commits
5f3ae0f9f1 ... f00b98714a

Author SHA1 Message Date
lg
f00b98714a Merge remote-tracking branch 'origin/dev' into dev 2025-10-25 21:24:39 +08:00
lg
4ff87f3996 bug修改 2025-10-25 21:23:58 +08:00
2 changed files with 3 additions and 1 deletions
Expand all files Collapse all files

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerSupplierServiceImpl.java
View File

@ -138,6 +138,8 @@ public class XzdCustomerSupplierServiceImpl extends ServiceImpl<XzdCustomerSuppl
XzdCustomerSupplierVos xzdCustomerSupplierVos = new XzdCustomerSupplierVos();
if (xzdCustomerSupplierVo != null) {
BeanUtils.copyProperties(xzdCustomerSupplierVo,xzdCustomerSupplierVos);
}else {
return null;
}
return xzdCustomerSupplierVos;
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerinformationServiceImpl.java
View File

@ -191,7 +191,7 @@ public class XzdCustomerinformationServiceImpl extends ServiceImpl<XzdCustomerin
for (Long id : StringUtils.splitTo(ids, Convert::toLong)) {
XzdCustomerSupplierVos xzdCustomerSuppliervo = xzdCustomerSupplierService.queryByIdone(id);
if (ObjectUtil.isNull(xzdCustomerSuppliervo) ){
if (ObjectUtil.isEmpty(xzdCustomerSuppliervo) ){
return null;
}
if (xzdCustomerSuppliervo.getType().equals("1")){