bug调整

foodnexus-module-erp/src/main/java/cn/iocoder/foodnexus/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierRespVO.java

@@ -135,5 +135,5 @@ public class ErpSupplierRespVO {
     /**
     /**
      * 关联部门id
      * 关联部门id
      */
      */
-    private String systemDeptId;
+    private Long systemDeptId;
 }
 }

foodnexus-module-erp/src/main/java/cn/iocoder/foodnexus/module/erp/dal/dataobject/purchase/ErpSupplierDO.java

@@ -175,6 +175,6 @@ public class ErpSupplierDO extends BaseDO {
     /**
     /**
      * 关联部门id
      * 关联部门id
      */
      */
-    private String systemDeptId;
+    private Long systemDeptId;
 
 
 }
 }
\ No newline at end of file

foodnexus-module-erp/src/main/java/cn/iocoder/foodnexus/module/erp/dal/dataobject/sale/ErpCustomerDO.java

@@ -125,6 +125,6 @@ public class ErpCustomerDO extends BaseDO {
     /**
     /**
      * 关联部门id
      * 关联部门id
      */
      */
-    private String systemDeptId;
+    private Long systemDeptId;
 
 
 }
 }
\ No newline at end of file

foodnexus-module-erp/src/main/java/cn/iocoder/foodnexus/module/erp/service/purchase/ErpSupplierServiceImpl.java

@@ -193,6 +193,7 @@ public class ErpSupplierServiceImpl implements ErpSupplierService, ErpSupplierAp
         supplierMapper.delete(ErpSupplierDO::getSystemDeptId, deptId);
         supplierMapper.delete(ErpSupplierDO::getSystemDeptId, deptId);
     }
     }
 
 
+    @Override
     public Long querySupplierIdByUserId(Long userId) {
     public Long querySupplierIdByUserId(Long userId) {
         AdminUserDO user = userService.getUser(userId);
         AdminUserDO user = userService.getUser(userId);
         if (!UserSystemEnum.SUPPLIER.getKey().equals(user.getUserSystem())) {
         if (!UserSystemEnum.SUPPLIER.getKey().equals(user.getUserSystem())) {

foodnexus-module-mall/foodnexus-module-order/src/main/java/cn/iocoder/foodnexus/module/order/service/checktask/CheckTaskServiceImpl.java

@@ -74,6 +74,7 @@ public class CheckTaskServiceImpl implements CheckTaskService, CheckTaskApi {
     private ErpPurchaseOrderService purchaseOrderService;
     private ErpPurchaseOrderService purchaseOrderService;
 
 
     @Autowired
     @Autowired
+    @Lazy
     private ErpPurchaseOrderMapper purchaseOrderMapper;
     private ErpPurchaseOrderMapper purchaseOrderMapper;
 
 
     @Autowired
     @Autowired
@@ -91,6 +92,7 @@ public class CheckTaskServiceImpl implements CheckTaskService, CheckTaskApi {
     private CustomerOrderService customerOrderService;
     private CustomerOrderService customerOrderService;
 
 
     @Autowired
     @Autowired
+    @Lazy
     private ErpSaleOrderService saleOrderService;
     private ErpSaleOrderService saleOrderService;
 
 
     @Autowired
     @Autowired

foodnexus-module-mall/foodnexus-module-order/src/main/java/cn/iocoder/foodnexus/module/order/service/customerorder/CustomerOrderServiceImpl.java

@@ -113,9 +113,11 @@ public class CustomerOrderServiceImpl implements CustomerOrderService, CustomerO
     private ErpSaleOutService saleOutService;
     private ErpSaleOutService saleOutService;
 
 
     @Autowired
     @Autowired
+    @Lazy
     private ErpSaleReturnService saleReturnService;
     private ErpSaleReturnService saleReturnService;
 
 
     @Autowired
     @Autowired
+    @Lazy
     private ErpSaleOrderService saleOrderService;
     private ErpSaleOrderService saleOrderService;
 
 
     @Autowired
     @Autowired

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

@@ -6,6 +6,7 @@ import cn.iocoder.foodnexus.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.foodnexus.framework.common.util.CommonUtil;
 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.framework.datapermission.core.rule.DataPermissionRule;
 import cn.iocoder.foodnexus.module.erp.api.service.ErpCustomerApi;
 import cn.iocoder.foodnexus.module.erp.api.service.ErpCustomerApi;
 import cn.iocoder.foodnexus.module.erp.api.service.ErpSupplierApi;
 import cn.iocoder.foodnexus.module.erp.api.service.ErpSupplierApi;
 import cn.iocoder.foodnexus.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import cn.iocoder.foodnexus.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
@@ -269,9 +270,10 @@ public class DeptServiceImpl implements DeptService {
     }
     }
 
 
     @Override
     @Override
+    @DataPermission(enable = false)
     public DeptDO getTopDept(Long deptId) {
     public DeptDO getTopDept(Long deptId) {
-        DeptDO deptDO = deptMapper.selectById(deptId);
-        if (CommonUtil.isNotEmpty(deptDO) && !DeptDO.PARENT_ID_ROOT.equals(deptDO.getParentId())) {
+        DeptDO deptDO = deptMapper.selectOne(DeptDO::getId, deptId);
+        if (!DeptDO.PARENT_ID_ROOT.equals(deptDO.getParentId())) {
             return this.getTopDept(deptDO.getParentId());
             return this.getTopDept(deptDO.getParentId());
         }
         }
         return deptDO;
         return deptDO;