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

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

@@ -276,6 +276,12 @@ public class LoginController extends WebBaseController {
         return this.success(vo) ;
     }
     
+    @RequestMapping("get-login-session")
+    @IgnoreLogin
+    public HaobanResponse getLoginSession() {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        return this.success(loginUser) ;
+    }
 
     /**
      * 切换GIC商户

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

@@ -107,6 +107,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
     @IgnoreLogin
     public HaobanResponse getInfoByCode(String 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"}
         logger.info("userDTOJson=============>{}", userDTOJson);
         UserDTO user = JSON.parseObject(userDTOJson, UserDTO.class);
         if (user == null) {
@@ -132,7 +134,6 @@ public class WxEnterpriseInfoController extends WebBaseController {
             wellDoneLoginInfoVo.setWxOpenUseId(userId);
             StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByUserId(userId);
             wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
-            //wellDoneLoginInfoVo.setPrivacyUseFlag(1);
             wellDoneLoginInfoVo.setStaffId("-1");
             return resultResponse(HaoBanErrCode.ERR_1, wellDoneLoginInfoVo);
         }