Merge branch 'feature/xgh/2501零散迭代' into 'master'

朋友圈

See merge request !2545

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/QywxOpenController.java

@@ -185,6 +185,7 @@ public class QywxOpenController {
     public RestResponse<OpenStaffDTO> init(String staffId, @RequestParam(defaultValue = "0") int loginAgainFlag , String wxEnterpriseId , String enterpriseId) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         ServiceResponse<OpenStaffDTO> staffResp = this.openStaffApiService.getByStaffId(staffId) ;
+        boolean flag = false ;
         if(null != loginUser) {
             wxEnterpriseId = loginUser.getWxEnterpriseId();
             enterpriseId = loginUser.getEnterpriseId();
@@ -192,6 +193,7 @@ public class QywxOpenController {
                 return RestResponse.failure("9999","参数为空") ;
             }
         }else {
+            flag = true ;
             // 未登录直接通过参数授权
             if(org.apache.commons.lang3.StringUtils.isAnyBlank(wxEnterpriseId,enterpriseId,staffId)) {
                 return RestResponse.failure("9999","参数为空") ;
@@ -209,6 +211,9 @@ public class QywxOpenController {
         }
         String checkMsg = this.check(wxEnterpriseId, enterpriseId , null != staffResp.getResult());
         if (null != checkMsg) {
+            if(flag) {
+                return RestResponse.successResult();
+            }
             return RestResponse.failure("9999", checkMsg);
         }
         if (StringUtils.isBlank(staffId)) {