Merge branch 'fix_2022_02_25' into developer

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

@@ -399,19 +399,6 @@ public class WelcomeServiceImpl implements WelcomeService {
         matchWelcome.setWelcomeMediaList(
                 convertWelcomeMedia(welcomeMediaMapper.listByWelcomeId(welcome.getWelcomeId()))
         );
-        if (StringUtils.isNotEmpty(welcome.getWelcomeImg())) {
-            // 兼容老的欢迎语图片
-            WelcomeMediaBO bo = new WelcomeMediaBO();
-            bo.setWelcomeId(welcome.getWelcomeId());
-            bo.setWxEnterpriseId(welcome.getWxEnterpriseId());
-            bo.setMediaTitle("图片");
-            bo.setMediaType(WelcomeMediaTypeEnum.IMAGE.getCode());
-            bo.setMediaUrl(welcome.getWelcomeImg());
-            if (CollectionUtils.isEmpty(matchWelcome.getWelcomeMediaList())) {
-                matchWelcome.setWelcomeMediaList(new ArrayList<>(1));
-            }
-            matchWelcome.getWelcomeMediaList().add(bo);
-        }
         return matchWelcome;
     }
 

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

@@ -194,7 +194,14 @@ public class MessageApiServiceImpl implements MessageApiService {
     }
 
     private boolean checkSuitEnterpriseId(String wxEnterpriseId) {
-        Set<String> wxSet = Sets.newHashSet("ca66a01b79474c40b3e7c7f93daf1a3b","c0c2186a947440aa8c0afbdd869ec043","ac451a350eed4a96958dd5c7377f8bd9");
+        Set<String> wxSet = Sets.newHashSet(
+                // 润辰
+                "ca66a01b79474c40b3e7c7f93daf1a3b",
+                // 尊兴
+                "c0c2186a947440aa8c0afbdd869ec043",
+                "ac451a350eed4a96958dd5c7377f8bd9",
+                // 鸿星尔克
+                "e034e2bd5d0b44d3bf553c9f8204094c");
         return wxSet.contains(wxEnterpriseId);
     }