Merge branch 'main' of http://124.243.245.42:3000/zkr/shz-backend into main

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java

@@ -1,9 +1,7 @@
 package com.ruoyi.cms.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.cms.domain.CompanyJobLive;
 import com.ruoyi.cms.mapper.CompanyJobLiveMapper;
-import com.ruoyi.cms.mapper.CompanyMapper;
 import com.ruoyi.cms.service.ICompanyJobLiveService;
 import com.ruoyi.common.core.domain.entity.Company;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -26,7 +24,7 @@ public class CompanyJobLiveServiceImpl implements ICompanyJobLiveService {
     private CompanyJobLiveMapper companyJobLiveMapper;
 
     @Autowired
-    private CompanyMapper companyMapper;
+    private CompanyServiceImpl companyService;
 
     @Override
     public CompanyJobLive selectById(Long id) {
@@ -64,7 +62,7 @@ public class CompanyJobLiveServiceImpl implements ICompanyJobLiveService {
     private Long getCompanyId() {
         LoginUser logUser = SecurityUtils.getLoginUser();
         SysUser sysUser = logUser.getUser();
-        Company company = companyMapper.selectOne(Wrappers.lambdaQuery(Company.class).eq(Company::getCode, sysUser.getIdCard()).orderByDesc(Company::getUpdateTime).last("LIMIT 1"));
+        Company company = companyService.queryCodeCompany(sysUser.getIdCard());
         return company.getCompanyId();
     }
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java

@@ -225,6 +225,11 @@ public class SsoService {
         if (ObjectUtils.isEmpty(userJson)) {
             throw new RuntimeException("获取用户信息失败");
         }
+        //用身份证号查询用户 用户类型（01：个人，02：企业）
+        // 转换成本地：app角色：0企业，1求职者，2网格员 3内部政府人员 4其他（浪潮用）
+        //userType对应appuser的isCompanyUser
+        String isCompanyUser = userJson.getString("userType");
+        isCompanyUser = "01".equals(isCompanyUser) ? "1" : "0";
         //获取身份证号
         String personCardNo = null;
         JSONObject info = null;
@@ -238,36 +243,18 @@ public class SsoService {
                     Long roleCode = role.getLong("roleCode");
                     return roleCode != null && roleCode == 1102L;
                 });
-        //获取用户信息
+        //保存企业信息
-        if (userJson.containsKey("info")) {
+        if("0".equals(isCompanyUser) && hasRecruitRole){
-            info = userJson.getJSONObject("info");
+            personCardNo=info.getString("entCreditCode");
-            if (ObjectUtils.isNotEmpty(info) && info.containsKey("personCardNo")) {
+            if (personCardNo != null) {
-                personCardNo = info.getString("personCardNo");
+                Company company=companyService.queryCodeCompany(personCardNo);
-                //解密处理
+                if(company==null){
-                if (StringUtils.isEmpty(personCardNo)) {
+                    JSONObject infoJson = userJson.getJSONObject("info");
-                    throw new RuntimeException("获取用户证件信息失败");
+                    saveCompany(infoJson);
-                }
-                personCardNo = EncryptUtil.decryptByAppIdAndSecret(personCardNo, webAppId, webAppSecret);
-            }else{
-                //保存企业信息
-                if(hasRecruitRole){
-                    personCardNo=info.getString("entCreditCode");
-                    if (personCardNo != null) {
-                        Company company=companyService.queryCodeCompany(personCardNo);
-                        if(company==null){
-                            JSONObject infoJson = userJson.getJSONObject("info");
-                            saveCompany(infoJson);
-                        }
-                    }
                 }
             }
         }
 
-        //用身份证号查询用户 用户类型（01：个人，02：企业）
-        // 转换成本地：app角色：0企业，1求职者，2网格员 3内部政府人员 4其他（浪潮用）
-        //userType对应appuser的isCompanyUser
-        String isCompanyUser = userJson.getString("userType");
-        isCompanyUser = "01".equals(isCompanyUser) ? "1" : "0";
         //1.先查appuser,不存在，则新增
         AppUser appUser = saveAppUser(userJson, isCompanyUser);
         //2.再查sysuser,不存在，则新增
@@ -322,20 +309,6 @@ public class SsoService {
         if (ObjectUtils.isEmpty(userJson)) {
             throw new RuntimeException("获取用户信息失败");
         }
-        //获取身份证号
-        String personCardNo = null;
-        JSONObject info = null;
-        if (userJson.containsKey("info")) {
-            info = userJson.getJSONObject("info");
-            if (ObjectUtils.isNotEmpty(info) && info.containsKey("personCardNo")) {
-                personCardNo = info.getString("personCardNo");
-                //解密处理
-                if (StringUtils.isEmpty(personCardNo)) {
-                    throw new RuntimeException("获取用户证件信息失败");
-                }
-                personCardNo = EncryptUtil.decryptByAppIdAndSecret(personCardNo, cmsAppId, cmsAppSecret);
-            }
-        }
 
         //用身份证号查询用户 用户类型（01：个人，02：企业）
         // 转换成本地：app角色：0企业，1求职者，2网格员 3内部政府人员 4其他（浪潮用）
@@ -467,10 +440,10 @@ public class SsoService {
             appUser.setDomicileAddress(info.getString("entRegisteredAddress"));
             personCardNo = info.getString("entCreditCode");
             appUser.setAddress(info.getString("entRegisteredAddress"));
-            String phone = userJson.getString("phonenumber");
+            String phone = info.getString("entAdminPhone");
             //解密电话号码
             if (StringUtils.isNotEmpty(phone)) {
-                phone = EncryptUtil.decryptByAppIdAndSecret(phone, webAppId, webAppSecret);
+                phone = EncryptUtil.decryptByAppIdAndSecret(phone, cmsAppId, cmsAppSecret);
                 appUser.setPhone(phone);
             }
 
@@ -538,10 +511,10 @@ public class SsoService {
         //0.企业 1.求职者 2.风格员
         if("0".equals(isCompanyUser)){
             personCardNo = info.getString("entCreditCode");
-            String phone = userJson.getString("phonenumber");
+            String phone = info.getString("entAdminPhone");
             //解密电话号码
             if (StringUtils.isNotEmpty(phone)) {
-                phone = EncryptUtil.decryptByAppIdAndSecret(phone, webAppId, webAppSecret);
+                phone = EncryptUtil.decryptByAppIdAndSecret(phone, cmsAppId, cmsAppSecret);
                 sysUser.setPhonenumber(phone);
             }
         } else {