Merge branch 'feature-0323' into developer

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

@@ -31,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
@@ -119,6 +118,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
             secretSetting.setSecretVal(permanentCode);
             secretSettingService.saveSecretSetting(secretSetting);
         }
+        agreeExternalUseridFlag(wxEnterpriseId,1);
         log.info("企业微信授权处理完成");
     }
 
@@ -328,8 +328,8 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     @Override
     public void agreeExternalUseridFlag(String wxEnterpriseId, Integer openFlag) {
         log.info("是否同意授权转换external_userid，运维操作：wxEnterpriseId:{}", wxEnterpriseId);
-        WxEnterpriseDTO wxEnterpriseDTO1 = wxEnterpriseService.selectById(wxEnterpriseId);
-        if (wxEnterpriseDTO1 == null) {
+        WxEnterpriseDTO wxEnterpriseDTOOld = wxEnterpriseService.selectById(wxEnterpriseId);
+        if (wxEnterpriseDTOOld == null) {
             return;
         }
         WxEnterpriseDTO wxEnterpriseDTO = new WxEnterpriseDTO();