fix：查询所有企业修改

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

@@ -75,11 +75,11 @@ public interface WxEnterpriseMapper {
                              @Param("wxEnterpriseId") String wxEnterpriseId);
 
     /**
-     * 列出所有wx企业（与gic关联）
+     * 列出所有企业（与gic关联）
      *
      * @return {@link List }<{@link WxEnterpriseDTO }>
      * @author mozhu
      * @date 2022-08-08 13:45:30
      */
-    List<WxEnterpriseDTO> listAllWxEnterprise();
+    List<WxEnterpriseDTO> listAllEnterprise();
 }
\ No newline at end of file

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

@@ -59,13 +59,13 @@ public interface WxEnterpriseService {
 
 
 	/**
-	 * 列出所有wx企业(已关联gic企业)
+	 * 列出所有企业(已关联gic企业)
 	 *
 	 * @return {@link List }<{@link WxEnterpriseDTO }>
 	 * @author mozhu
 	 * @date 2022-08-08 13:38:31
 	 */
-	List<WxEnterpriseDTO> listAllWxEnterprise();
+	List<WxEnterpriseDTO> listAllEnterprise();
 
 	/**
 	 * 更新userid

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

@@ -133,8 +133,8 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
     }
 
     @Override
-    public List<WxEnterpriseDTO> listAllWxEnterprise() {
-        return mapper.listAllWxEnterprise();
+    public List<WxEnterpriseDTO> listAllEnterprise() {
+        return mapper.listAllEnterprise();
     }
 
     @Override

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

@@ -716,7 +716,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
     @Override
     public void checkStaffOpenContact(String param) {
         logger.info("检查员工是否开启联系我,定时任务，start");
-        List<WxEnterpriseDTO> tabHaobanWxEnterprises = wxEnterpriseService.listAllWxEnterprise();
+        List<WxEnterpriseDTO> tabHaobanWxEnterprises = wxEnterpriseService.listAllEnterprise();
         for (WxEnterpriseDTO wxEnterpriseDTO : tabHaobanWxEnterprises) {
             String enterpriseId = wxEnterpriseDTO.getEnterpriseId();
             //查询出所有正常的导购

haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml

@@ -497,16 +497,16 @@
         where wx_enterprise_id = #{wxEnterpriseId}
     </update>
 
-    <select id="listAllWxEnterprise" resultType="com.gic.haoban.manage.api.dto.WxEnterpriseDTO" >
+    <select id="listAllEnterprise" resultType="com.gic.haoban.manage.api.dto.WxEnterpriseDTO" >
         select
-        a.wx_enterprise_id wxEnterpriseId,
-        a.corpid corpid,
-        a.corp_name corpName,
-        b.enterprise_id enterpriseId
-        from tab_haoban_wx_enterprise a
-        join tab_haoban_wx_enterprise_related b on a.wx_enterprise_id = b.wx_enterprise_id
+        b.wx_enterprise_id wxEnterpriseId,
+        b.corpid corpid,
+        b.corp_name corpName,
+        a.enterprise_id enterpriseId
+        from tab_haoban_wx_enterprise_related a
+        left join tab_haoban_wx_enterprise b on a.wx_enterprise_id = b.wx_enterprise_id
         where a.status_flag = 1 and b.status_flag = 1
-        group by a.wx_enterprise_id
+        group by a.enterprise_id
     </select>
 
 </mapper>
\ No newline at end of file