ソースを参照

fix(build): 修复远程提交3处编译错误 - ProductOrderService 漏注入 supplyCustomerRelationService / SupplyTeamController var改显式类型 / SupplyCustomerRelationService 移除不存在的 FamilyMember.getRole()

Xiaogang Liao 3 日 前
親
コミット
d4171dd6ff

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/SupplyTeamController.java

@@ -70,7 +70,7 @@ public class SupplyTeamController {
             @RequestAttribute("userId") Long userId) {
         Long systemId = ParamUtils.getLong(params.get("systemId"));
         Long familyId = ParamUtils.getLong(params.get("familyId"));
-        var relation = supplyCustomerRelationService.getRelationByFamily(systemId, familyId);
+        Object relation = supplyCustomerRelationService.getRelationByFamily(systemId, familyId);
         return Result.success(relation);
     }
 }

+ 3 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/ProductOrderService.java

@@ -142,6 +142,9 @@ public class ProductOrderService {
     @Resource
     private SupplyHierarchyService supplyHierarchyService;
 
+    @Resource
+    private SupplyCustomerRelationService supplyCustomerRelationService;
+
     @Resource
     private SupplyCustomerRelationMapper supplyCustomerRelationMapper;
 

+ 0 - 1
cfc-backend/src/main/java/com/etotem/cfc/service/SupplyCustomerRelationService.java

@@ -59,7 +59,6 @@ public class SupplyCustomerRelationService {
             FamilyMember parentMember = familyMemberMapper.selectOne(
                 new LambdaQueryWrapper<FamilyMember>()
                     .eq(FamilyMember::getFamilyId, relation.getFamilyId())
-                    .eq(FamilyMember::getRole, "parent")
                     .orderByAsc(FamilyMember::getGeneration)
                     .last("LIMIT 1")
             );