From ba3e66a3c47da36f2c9a635f48d040180a9c0ac3 Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Wed, 22 Oct 2025 14:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E7=AB=AF-?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/cms/domain/Job.java  |  2 +-
 .../cms/service/impl/AppUserServiceImpl.java     | 16 ++++++++++++++--
 .../ruoyi/common/core/domain/entity/Company.java |  2 +-
 .../framework/web/service/SysLoginService.java   |  4 ++++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java
index 1a04a43..8198b14 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java
@@ -109,7 +109,7 @@ public class Job extends BaseEntity
     @ApiModelProperty("是否收藏 0为否 1为是")
     private Integer isCollection;
 
-    @ApiModelProperty("工作地点")
+    @ApiModelProperty("岗位描述")
     private String description;
 
     @ApiModelProperty("是否发布 0未发布 1发布")
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
index ec2edd6..dd53a03 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.cms.mapper.*;
 import com.ruoyi.cms.util.StringUtil;
+import com.ruoyi.common.core.domain.entity.Company;
 import com.ruoyi.common.core.domain.entity.JobTitle;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.RegisterBody;
@@ -130,13 +131,21 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
     @Override
     public int registerAppUser(RegisterBody registerBody) {
         AppUser appUser=registerBody.getAppUser();
-        appUser.setUserId(SiteSecurityUtils.getUserId());
+        System.out.println("userId================"+SiteSecurityUtils.getUserId());
+        if(SiteSecurityUtils.isLogin()){
+            if(appUser==null){
+                appUser=appUserMapper.selectById(SiteSecurityUtils.getUserId());
+            }else{
+                appUser.setUserId(SiteSecurityUtils.getUserId());
+            }
+        }
         //角色集合
         Map mapUserRole=new HashMap<>();
         switch (appUser.getIsCompanyUser()){
             case "0"://企业
                 if(registerBody.getCompany()!=null){
-                    Long companyId=registerBody.getCompany().getCompanyId();
+                    Company company=registerBody.getCompany();
+                    Long companyId=company.getCompanyId();
                     if(companyId==null){
                         companyMapper.insert(registerBody.getCompany());
                         registerBody.getCompany().getCompanyContactList().forEach(it->{
@@ -146,6 +155,9 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
                     if(registerBody.getCompany().getCompanyContactList()!=null){
                         companyContactMapper.batchInsert(registerBody.getCompany().getCompanyContactList());
                     }
+                    //保存app_user信息
+                    appUser.setIdCard(company.getCode());
+                    appUser.setName(company.getName());
                 }
                 mapUserRole.put("roleId",100);
                 break;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java
index 60f0a08..3cd9791 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java
@@ -50,7 +50,7 @@ public class Company extends BaseEntity
     @ApiModelProperty("单位介绍")
     private String description;
 
-    @Excel(name = "性质")
+    @Excel(name = "性质-已改为企业类型")
     @ApiModelProperty("性质")
     private String nature;
 
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index fb01b06..fa086c5 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -256,6 +256,10 @@ public class SysLoginService
         //验证是否登录过
         AppUser existingUser=appUserService.selectByOpenid(openid);
         if(existingUser!=null){
+            if(StringUtils.isEmpty(existingUser.getIsCompanyUser())){
+                existingUser.setIsCompanyUser(dto.getUserType());
+                appUserService.updateAppUser(existingUser);
+            }
             String token = loginUserIdApp(existingUser);
             ajax.put(Constants.TOKEN, token);
             ajax.put("isNewUser", false);