refactor：增加判断

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseServiceImpl.java

@@ -6,6 +6,7 @@ import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,11 +34,17 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
 
     @Override
     public WxEnterpriseDTO selectById(String wxEnterpriseId) {
+        if (StringUtils.isBlank(wxEnterpriseId)) {
+            return null;
+        }
         return EntityUtil.changeEntityByJSON(WxEnterpriseDTO.class, mapper.selectByPrimaryKey(wxEnterpriseId));
     }
 
     @Override
     public TabHaobanWxEnterprise getEnterpriseBycorpId(String corpId) {
+        if (StringUtils.isBlank(corpId)) {
+            return null;
+        }
         return mapper.getEnterpriseBycorpId(corpId, 1);
     }
 
@@ -77,6 +84,9 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
 
     @Override
     public TabHaobanWxEnterprise getEnterpriseByCorpName(String corpName) {
+        if (StringUtils.isBlank(corpName)) {
+            return null;
+        }
         return this.mapper.getEnterpriseByCorpName(corpName);
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java

@@ -26,7 +26,9 @@ import com.gic.haoban.manage.service.dao.mapper.*;
 import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO;
 import com.gic.haoban.manage.service.pojo.QywxTagSyncInfoPojo;
+import com.gic.member.api.dto.MemberDTO;
 import com.gic.member.api.service.MemberApiService;
+import com.gic.member.api.service.MemberService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.QywxNewExternalUseridDTO;
@@ -73,6 +75,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     private WxEnterpriseApiService wxEnterpriseApiService;
     @Autowired
     private MemberApiService memberApiService;
+    @Autowired
+    private MemberService memberService;
 
     /**
      * 查询导购好友关联
@@ -286,7 +290,14 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
 
     @Override
     public List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId) {
-        List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByMemberId(memberId, null);
+        if (StringUtils.isBlank(memberId)) {
+            return null;
+        }
+        MemberDTO member = memberService.getMember(memberId);
+        if (member == null) {
+            return null;
+        }
+        List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByMemberId(memberId, member.getEnterpriseId());
         return EntityUtil.changeEntityListNew(ExternalClerkRelatedShortInfoDTO.class, list);
     }