Merge remote-tracking branch 'origin/developer' into developer

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

@@ -144,16 +144,22 @@ public class InfoController extends WebBaseController{
                         String dictName = loginUserId.getDictName();
                         String[] split = dictName.split("-");
                         if (split.length > 1) {
-                            String weiCorpId = split[1];
-                            WxEnterpriseDTO weiWxEnterpriseDTO = wxEnterpriseApiService.getEnterpriseBycorpId(weiCorpId);
-                            if (null != weiWxEnterpriseDTO) {
-                                loginStaff = staffDTOS.stream().filter(staffDTO -> {
-                                    if (weiWxEnterpriseDTO.getWxEnterpriseId().equals(staffDTO.getWxEnterpriseId())) {
-                                        return true;
-                                    } else {
-                                        return false;
+                            for (int i=0;i<split.length;i++) {
+//                            String weiCorpId = split[1];
+                                String weiCorpId = split[i];
+                                if (enterprise.getWxEnterpriseId().equals(wxEnterpriseApiService.getEnterpriseBycorpId(weiCorpId))) {
+                                    WxEnterpriseDTO weiWxEnterpriseDTO = wxEnterpriseApiService.getEnterpriseBycorpId(weiCorpId);
+                                    System.out.println("执行"+i);
+                                    if (null != weiWxEnterpriseDTO) {
+                                        loginStaff = staffDTOS.stream().filter(staffDTO -> {
+                                            if (weiWxEnterpriseDTO.getWxEnterpriseId().equals(staffDTO.getWxEnterpriseId())) {
+                                                return true;
+                                            } else {
+                                                return false;
+                                            }
+                                        }).findFirst().orElse(staffDTOS.get(0));
                                     }
-                                }).findFirst().orElse(staffDTOS.get(0));
+                                }
                             }
                         }
                     }
@@ -295,7 +301,7 @@ public class InfoController extends WebBaseController{
     private MemberLoginQo getUserByCode(WxEnterpriseDTO enterpriseDTO, String code, String enterpriseId) {
         SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(enterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);
         if (null == secretSetting || StringUtils.isBlank(secretSetting.getSecretVal())) {
-            logger.info("MEMBER_WAPPsecret配置没有配置");
+            logger.info("MEMBER_WAPPsecret配置没1ss有配置");
             return null;
         }
         String userDTOJson = qywxUserApiService.getUserByCode(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), code);