Commit 57c03cba by 墨竹

fix:兼容好办助手和代开发

parent bcf15b41
...@@ -284,21 +284,16 @@ public class WxEnterpriseController extends WebBaseController { ...@@ -284,21 +284,16 @@ public class WxEnterpriseController extends WebBaseController {
String wxEnterpriseId = ""; String wxEnterpriseId = "";
LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser(); LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
wxEnterpriseId = login.getWxEnterpriseId(); wxEnterpriseId = login.getWxEnterpriseId();
WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
List<SecretSettingDTO> listSecret = wxEnterpriseApiService.listSecret(wxEnterpriseId); List<SecretSettingDTO> listSecret = wxEnterpriseApiService.listSecret(wxEnterpriseId);
if (CollectionUtils.isEmpty(listSecret)) { if (CollectionUtils.isEmpty(listSecret)) {
return resultResponse(HaoBanErrCode.ERR_1, false); return resultResponse(HaoBanErrCode.ERR_1, false);
} }
Set<Integer> secretTypeList = listSecret.stream().filter(secretSettingDTO -> { Set<Integer> secretTypeList = listSecret.stream().filter(secretSettingDTO -> secretSettingDTO.getCheckFlag() == 1).map(secretSettingDTO -> secretSettingDTO.getSecretType()).collect(Collectors.toSet());
return secretSettingDTO.getCheckFlag() == 1;
}).map(secretSettingDTO -> {
return secretSettingDTO.getSecretType();
}).collect(Collectors.toSet());
if (CollectionUtils.isEmpty(secretTypeList)) { if (CollectionUtils.isEmpty(secretTypeList)) {
return resultResponse(HaoBanErrCode.ERR_1, false); return resultResponse(HaoBanErrCode.ERR_1, false);
} }
if (secretTypeList.contains(SecretTypeEnum.HAOBAN_HELP.getVal()) && secretTypeList.contains(SecretTypeEnum.CONTACT_CUSTOMER.getVal())) { if ((secretTypeList.contains(SecretTypeEnum.HAOBAN_HELP.getVal()) || secretTypeList.contains(SecretTypeEnum.CUSTOMIZED_APP.getVal()))
&& secretTypeList.contains(SecretTypeEnum.CONTACT_CUSTOMER.getVal())) {
return resultResponse(HaoBanErrCode.ERR_1, true); return resultResponse(HaoBanErrCode.ERR_1, true);
} else { } else {
return resultResponse(HaoBanErrCode.ERR_1, false); return resultResponse(HaoBanErrCode.ERR_1, false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment