bug修复

foodnexus-module-erp/src/main/java/cn/iocoder/foodnexus/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java

@@ -167,7 +167,7 @@ public class ErpFinanceReceiptServiceImpl implements ErpFinanceReceiptService {
             } else if (ObjectUtil.equal(item.getBizType(), ErpBizTypeEnum.SALE_RETURN.getType())) {
             } else if (ObjectUtil.equal(item.getBizType(), ErpBizTypeEnum.SALE_RETURN.getType())) {
                 ErpSaleReturnDO saleReturn = saleReturnService.validateSaleReturn(item.getBizId());
                 ErpSaleReturnDO saleReturn = saleReturnService.validateSaleReturn(item.getBizId());
                 Assert.equals(saleReturn.getCustomerId(), customerId, "客户必须相同");
                 Assert.equals(saleReturn.getCustomerId(), customerId, "客户必须相同");
-                item.setTotalPrice(saleReturn.getTotalPrice().negate()).setBizNo(saleReturn.getNo());
+                item.setTotalPrice(BigDecimal.valueOf(saleReturn.getTotalPrice()).negate()).setBizNo(saleReturn.getNo());
             } else {
             } else {
                 throw new IllegalArgumentException("业务类型不正确：" + item.getBizType());
                 throw new IllegalArgumentException("业务类型不正确：" + item.getBizType());
             }
             }

foodnexus-module-system/src/main/java/cn/iocoder/foodnexus/module/system/service/dept/DeptServiceImpl.java

@@ -3,6 +3,7 @@ package cn.iocoder.foodnexus.module.system.service.dept;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.foodnexus.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.foodnexus.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.foodnexus.framework.common.util.CommonUtil;
 import cn.iocoder.foodnexus.framework.common.util.object.BeanUtils;
 import cn.iocoder.foodnexus.framework.common.util.object.BeanUtils;
 import cn.iocoder.foodnexus.framework.datapermission.core.annotation.DataPermission;
 import cn.iocoder.foodnexus.framework.datapermission.core.annotation.DataPermission;
 import cn.iocoder.foodnexus.module.erp.api.service.ErpCustomerApi;
 import cn.iocoder.foodnexus.module.erp.api.service.ErpCustomerApi;
@@ -270,7 +271,7 @@ public class DeptServiceImpl implements DeptService {
     @Override
     @Override
     public DeptDO getTopDept(Long deptId) {
     public DeptDO getTopDept(Long deptId) {
         DeptDO deptDO = deptMapper.selectById(deptId);
         DeptDO deptDO = deptMapper.selectById(deptId);
-        if (!DeptDO.PARENT_ID_ROOT.equals(deptDO.getParentId())) {
+        if (CommonUtil.isNotEmpty(deptDO) && !DeptDO.PARENT_ID_ROOT.equals(deptDO.getParentId())) {
             return this.getTopDept(deptDO.getParentId());
             return this.getTopDept(deptDO.getParentId());
         }
         }
         return deptDO;
         return deptDO;