fix：查询门店返回企业名称和corpname修复

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseRelatedMapper.java

@@ -9,16 +9,12 @@ public interface WxEnterpriseRelatedMapper {
 
     int deleteByPrimaryKey(String wxEnterpriseRelatedId);
 
-    int insert(TabHaobanWxEnterpriseRelated record);
-
     int insertSelective(TabHaobanWxEnterpriseRelated record);
 
     TabHaobanWxEnterpriseRelated selectByPrimaryKey(String wxEnterpriseRelatedId);
 
     int updateByPrimaryKeySelective(TabHaobanWxEnterpriseRelated record);
 
-    int updateByPrimaryKey(TabHaobanWxEnterpriseRelated record);
-    
     List<TabHaobanWxEnterpriseRelated> listByWxenterpriseId(String wxEnterpriseId);
 
     @Deprecated

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWxEnterpriseRelated.java

@@ -10,6 +10,8 @@ public class TabHaobanWxEnterpriseRelated implements Serializable {
 
     private String enterpriseId;
     
+    private String enterpriseName;
+
     private String version;
 
     private Integer statusFlag;
@@ -136,5 +138,11 @@ public class TabHaobanWxEnterpriseRelated implements Serializable {
 		this.staffName = staffName;
 	}
 
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
 
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
 }
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

@@ -119,12 +119,17 @@ public class StoreController extends WebBaseController {
             if (wxEnterpriseDTO == null) {
                 continue;
             }
+            String enterpriseId = clerk.getEnterpriseId();
+            EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(enterpriseId);
+            if (enterpriseDTO == null) {
+                continue;
+            }
             //主门店标志
             int mainStoreFlag = 0;
             if (storeId.equals(store.getStoreId())) {
                 mainStoreFlag = 1;
             }
-            EnterpriseDetailDTO enterpriseDetailDTO = enterpriseTypeMap.get(clerk.getEnterpriseId());
+            EnterpriseDetailDTO enterpriseDetailDTO = enterpriseTypeMap.get(enterpriseId);
             staffDepartmentRelatedApiService.listByStaffId(staffId);
             StaffStoreVO vo = new StaffStoreVO();
             vo.setClerkCode(clerk.getClerkCode());
@@ -132,7 +137,7 @@ public class StoreController extends WebBaseController {
             vo.setMemberOpenCardFlag(enterpriseDetailDTO != null ? enterpriseDetailDTO.getMemberOpenCardFlag() : null);
             vo.setClerkId(clerk.getClerkId());
             vo.setClerkType(clerk.getClerkType());
-            vo.setEnterpriseId(clerk.getEnterpriseId());
+            vo.setEnterpriseId(enterpriseId);
             vo.setMainStoreFlag(mainStoreFlag);
             vo.setPhoneNumber(clerk.getPhoneNumber());
             vo.setStaffId(staffId);
@@ -143,7 +148,7 @@ public class StoreController extends WebBaseController {
             vo.setClerkName(clerk.getClerkName());
             vo.setHeadImg(staffDTO.getHeadImg());
             vo.setBindFlag(1);
-            vo.setEnterpriseName(enterpriseDetailDTO != null ? enterpriseDetailDTO.getEnterpriseName() : null);
+            vo.setEnterpriseName(enterpriseDTO.getEnterpriseName());
             vo.setCorpName(wxEnterpriseDTO.getCorpName());
             list.add(vo);
         }