From c8358449139b1b562ca1f1e52fda60e89eb11ae9 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Tue, 15 Apr 2025 13:38:09 +0800
Subject: [PATCH] fix

---
 .../src/main/java/com/cool/store/service/PushService.java     | 2 +-
 .../java/com/cool/store/service/impl/PushServiceImpl.java     | 4 ++--
 .../java/com/cool/store/service/impl/SyncDataServiceImpl.java | 4 +++-
 .../cool/store/controller/webb/PCOrderSysInfoController.java  | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PushService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PushService.java
index b5f406259..d67ad77ad 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/PushService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PushService.java
@@ -58,7 +58,7 @@ public interface PushService {
      */
     String getPosToken(GetAccessTokenDTO dto);
 
-    List<XgjOrganizationDTO> getXgjOrganization(String partnerId);
+    List<XgjOrganizationDTO> getXgjOrganization(String parentId);
 
 
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java
index c8e116e2f..550daf73c 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java
@@ -150,7 +150,7 @@ public class PushServiceImpl implements PushService {
     }
 
     @Override
-    public List<XgjOrganizationDTO> getXgjOrganization(String partnerId) {
+    public List<XgjOrganizationDTO> getXgjOrganization(String parentId) {
         String key = active+"_XgjOrganization_" + eid;
         String resObject = redisUtilPool.getString(key);
         if (StringUtils.isBlank(resObject)) {
@@ -171,7 +171,7 @@ public class PushServiceImpl implements PushService {
 
         }
         List<XgjOrganizationDTO> filteredList = response.stream()
-                .filter(customer -> customer.getParentId().equals(partnerId))
+                .filter(customer -> customer.getParentId().equals(parentId))
                 .collect(Collectors.toList());
         return filteredList;
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
index 178434054..951cc82bf 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
@@ -93,7 +93,9 @@ public class SyncDataServiceImpl implements SyncDataService {
         if (signFranchiseDO != null) {
             List<String> partnershipSignatory = new ArrayList<>();
             partnershipSignatory.add(signFranchiseDO.getPartnershipSignatoryFirst());
-            partnershipSignatory.add(signFranchiseDO.getPartnershipSignatorySecond());
+            if (StringUtils.isNotBlank(signFranchiseDO.getPartnershipSignatorySecond())) {
+                partnershipSignatory.add(signFranchiseDO.getPartnershipSignatorySecond());
+            }
             request.setPartnershipSignatory(partnershipSignatory);
             request.setBusinessModel(signFranchiseDO.getBusinessModel());
         }
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOrderSysInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOrderSysInfoController.java
index 36d1dc501..ea13864c0 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOrderSysInfoController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOrderSysInfoController.java
@@ -47,8 +47,8 @@ public class PCOrderSysInfoController {
 
     @GetMapping("/getXgjOrganization")
     @ApiOperation("获取新管家组织架构")
-    public ResponseResult<List<XgjOrganizationDTO>> getXgjOrganization(@RequestParam(value = "partnerId", required = true,defaultValue = "0") String partnerId) {
-        return ResponseResult.success(pushService.getXgjOrganization(partnerId));
+    public ResponseResult<List<XgjOrganizationDTO>> getXgjOrganization(@RequestParam(value = "parentId", required = true,defaultValue = "0") String parentId) {
+        return ResponseResult.success(pushService.getXgjOrganization(parentId));
     }
 
 }