add

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/AuthRedirectController.java

@@ -161,12 +161,13 @@ public class AuthRedirectController {
         String url = WeiXinCorpController.GET_CORP_INSIDE_USERINFO_URL.replace("ACCESS_TOKEN",getCorpConcactAccessToken(corpInfo)).replace("CODE", code);
         String forObject = this.restTemplate.getForObject(url, String.class);
         JSONObject obj = JSONObject.parseObject(forObject);
-        String wxUserId = obj.getString("UserId");
-        String openUserId = obj.getString("open_userid");
-        String corpId = obj.getString("CorpId");
+        String wxUserId = obj.getString("userid");
+//        String openUserId = obj.getString("open_userid");
+//        String corpId = obj.getString("CorpId");
 
-        System.out.println("wxUserId="+wxUserId+", openUserId="+openUserId);
-        List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("corpwx_userid", openUserId));
+        System.out.println("wxUserId="+wxUserId);
+        System.out.println(obj.toString());
+        List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("corpwx_userid", wxUserId).eq("company_id", corpInfo.getCompanyId()));
         Integer companyId = 0;
         if (userList.size() > 0) {
             //该用户已存在
@@ -187,11 +188,7 @@ public class AuthRedirectController {
             } else {
                 User curUser = userMapper.selectOne(new QueryWrapper<User>().eq("company_id", wxCorpInfo.getCompanyId()).eq("corpwx_userid", wxUserId));
                 if (curUser == null) {
-//                    reqParam.put("errorMsg", MessageUtils.message("user.accountNoExist"));
-                    //用户不存在，去生成该用户
-                    if (wxCorpInfo.getSaasSyncContact() == 1) {
-                        curUser = wxCorpInfoService.generateUserInfo(wxCorpInfo.getCompanyId(), openUserId);
-                    }
+                    reqParam.put("errorMsg", MessageUtils.message("user.accountNoExist"));
                 }
                 if (curUser != null) {
                     if (curUser.getIsActive() == 1) {
@@ -199,11 +196,9 @@ public class AuthRedirectController {
                         reqParam.put("userId", curUser.getId());
                     } else {
                         //提示账号已停用
-                        //reqParam.put("errorMsg", "您的账号已停用，无法登录");
                         reqParam.put("errorMsg", MessageUtils.message("user.inactive"));
                     }
                 } else {
-                    System.err.println("==生成企业微信User失败==");
                     reqParam.put("errorMsg", MessageUtils.message("user.accountNoExist"));
                 }
 
@@ -232,13 +227,11 @@ public class AuthRedirectController {
         }
         ModelAndView modelAndView = new ModelAndView(
                 new RedirectView(redirecUrl), reqParam);
-
+        reqParam.put("isPrivateCorpWX", 1);
+        System.out.println("跳转=="+redirecUrl);
         return modelAndView;
     }
 
-
-
-
     private HashMap getCompExpireInfo(Integer companyId) {
         Company company = companyMapper.selectById(companyId);
         int version = 1;

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application-bkserver.yml

@@ -82,10 +82,12 @@ mybatis:
 upload:
   path: /www/staticproject/timesheet/upload/
 
-
-
-
-
+referer:
+  refererDomain:
+    - localhost
+    - gsmb.sgai.com.cn
+    - gspc.sgai.com.cn
+    - dev.huoshishanxin.com
 ##actuator健康检查配置
 management:
   security:
@@ -103,10 +105,12 @@ management:
 
 configEnv:
   isDev: true
+  # 是否是私有化部署，企业内部应用
+  isPrivateDeploy: true
 
 privateDeployURL:
   pcUrl: http://dev.huoshishanxin.com/#/
   mobUrl: http://dev.huoshishanxin.com/#/
 
-#平台作为服务商的参数
+# 私有化部署的企业自己的corpId
 corpId: ww0b9aafe69e506b8b

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -99,7 +99,7 @@
                     <el-form-item style="float:right;" v-if="permissions.structureExport">
                         <el-link type="primary" :underline="false" @click="showExportDialog">{{ $t('exportpersonnel') }}</el-link>
                     </el-form-item>
-                    <el-form-item style="float:right;" v-if="user.dingdingUserid == null && permissions.structureAdd && user.userNameNeedTranslate != '1'">
+                    <el-form-item style="float:right;" v-if="user.timeType.syncDingding == 0 && permissions.structureAdd && user.userNameNeedTranslate != '1'">
                         <el-link type="primary" :underline="false" @click="openInsertDialog(null)">{{ $t('addpersonnel') }}</el-link>
                     </el-form-item>
                     <!--导入薪资-->
@@ -107,7 +107,7 @@
                         <el-link type="primary" :underline="false" @click="importUserSalary(null)">{{ $t('importSalary') }}</el-link>
                     </el-form-item>
                     
-                    <el-form-item style="float:right;" v-if="user.dingdingUserid == null && permissions.structureImport && user.userNameNeedTranslate != '1'">
+                    <el-form-item style="float:right;" v-if="user.timeType.syncDingding == 0 && permissions.structureImport && user.userNameNeedTranslate != '1'">
                         <el-link type="primary" :underline="false" @click="importUserC">{{ $t('bulkimport') }}</el-link>
                     </el-form-item>
                     <el-form-item style="float:right;" v-if="user.corpwxUserid != null && permissions.structureImport && user.companyId==469">