Merge branch 'feature_0711' into developer

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

@@ -2130,9 +2130,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         boolean flag = qywxUserApiService.finishOpenidMigration(corpid, serviceCorpid, tabHaobanWxApplication.getAgentId(), openidType);
         if (flag) {
             wxApplicationMapper.updateCorpidById(tabHaobanWxApplication.getWxApplicationId(), openCorpid);
-            wxEnterpriseService.updateUseridFlagById(1, openCorpid, wxEnterpriseId);
+            wxEnterpriseService.updateUseridFlagById(1, null, wxEnterpriseId);
         } else {
-            wxEnterpriseService.updateUseridFlagById(3, openCorpid, wxEnterpriseId);
+            wxEnterpriseService.updateUseridFlagById(3, null, wxEnterpriseId);
         }
         String lockKey = "updateNewUseridCorpid_" + wxEnterpriseId;
         RedisUtil.unlock(lockKey);

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

@@ -106,6 +106,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
     @RequestMapping(value = "get-info-by-code", method = {RequestMethod.GET, RequestMethod.POST})
     @IgnoreLogin
     public HaobanResponse getInfoByCode(String code) {
+        logger.info("code:{}",code);
         String userDTOJson = qywxCorpApiService.getCodeSession(config.getWxSuiteid(), code);
        // {"errcode":0,"corpid":"wweac4ef962720aa12","session_key":"oNKOu4tDcnTWdj4wOg75YQ==","errmsg":"ok",
        //     "open_userid":"wo59NLDQAAxeJ-Nr7_vwkZVc7QOG73PQ","userid":"xugaohua","deviceid":"0BB1D1FA-C5A2-4BDD-80A2-33B6BB230F8A"}
@@ -114,7 +115,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         if (user == null) {
             return resultResponse(HaoBanErrCode.ERR_6);
         }
-        String userId = user.getUserid();
+        String userId = user.getOpen_userid();
         String corpId = user.getCorpid();
         WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
         StaffDTO loginStaff = null;