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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
青云
2025-10-25 21:25:40 +08:00
parent a8a198b51f f00b98714a
commit 123896f08b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File 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(); XzdCustomerSupplierVos xzdCustomerSupplierVos = new XzdCustomerSupplierVos();
if (xzdCustomerSupplierVo != null) { if (xzdCustomerSupplierVo != null) {
BeanUtils.copyProperties(xzdCustomerSupplierVo,xzdCustomerSupplierVos); BeanUtils.copyProperties(xzdCustomerSupplierVo,xzdCustomerSupplierVos);
}else {
return null;
} }
return xzdCustomerSupplierVos; return xzdCustomerSupplierVos;
} }

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

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