From f6fcdcd6d88a7d6114fbc9446ae0ede81da2d476 Mon Sep 17 00:00:00 2001
From: guohb <1808583880@qq.com>
Date: Wed, 5 Jun 2024 20:58:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=9D=A3=E5=AF=BC?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ApplyLicenseServiceImpl.java | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
index c6514ad49..85b6baedc 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
@@ -17,10 +17,7 @@ import com.cool.store.request.SubmitLicenseRequest;
 import com.cool.store.response.GetStoreInfoByCodeResponse;
 import com.cool.store.response.LicenseListResponse;
 import com.cool.store.response.SubmitLicenseResponse;
-import com.cool.store.service.ApplyLicenseService;
-import com.cool.store.service.CoolStoreStartFlowService;
-import com.cool.store.service.PreparationService;
-import com.cool.store.service.SysStoreAppService;
+import com.cool.store.service.*;
 import com.cool.store.utils.RedisUtilPool;
 import com.cool.store.utils.StringUtil;
 import com.cool.store.utils.poi.StringUtils;
@@ -93,6 +90,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
     @Resource
     EnterpriseUserMapper enterpriseUserMapper;
 
+    @Resource
+    UserAuthMappingService userAuthMappingService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -209,10 +209,19 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
         }
 
         SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId);
-        EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId());
-        if (Objects.nonNull(userInfoByJobnumber)){
-            submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber());
+        if (Objects.nonNull(systemBuildingShopDO.getSupervisorId())){
+            EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId());
+            if (Objects.nonNull(userInfoByJobnumber)){
+                submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber());
+            }
+        }else {
+            EnterpriseUserDO enterpriseUserDO = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId());
+            if (Objects.nonNull(enterpriseUserDO)){
+                submitLicenseResponse.setApprover(enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber());
+            }
         }
+
+
         //3.既没有提交数据，也没有在鲜丰端查到证照信息，则返回空自由填写
         return submitLicenseResponse;
     }

From 60ba1d54d6bb0480b977fa3193f2ef0bb0c45baa Mon Sep 17 00:00:00 2001
From: guohb <1808583880@qq.com>
Date: Wed, 5 Jun 2024 20:59:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=9D=A3=E5=AF=BC?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cool/store/service/impl/ApplyLicenseServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
index 85b6baedc..f71d5f387 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
@@ -209,7 +209,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
         }
 
         SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId);
-        if (Objects.nonNull(systemBuildingShopDO.getSupervisorId())){
+        if (Objects.nonNull(systemBuildingShopDO) && Objects.nonNull(systemBuildingShopDO.getSupervisorId())){
             EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId());
             if (Objects.nonNull(userInfoByJobnumber)){
                 submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber());