From 922223c63579f0503f7baf93e4bce2084e5befea Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Mon, 15 Dec 2025 16:39:57 +0800
Subject: [PATCH] =?UTF-8?q?app=5Fuser=E6=B7=BB=E5=8A=A0dw=5Fuserid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/app/AppUserMapper.xml          | 3 ++-
 .../java/com/ruoyi/common/core/domain/entity/AppUser.java    | 5 ++++-
 .../com/ruoyi/framework/web/service/SysLoginService.java     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
index 7a514bb..f009314 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
@@ -31,10 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="idCard"    column="id_card"    />
         <result property="workExperience"    column="work_experience"    />
         <result property="isCompanyUser"    column="is_company_user"    />
+        <result property="dwUserid"    column="dw_userid"    />
     </resultMap>
 
     <sql id="selectAppUserVo">
-        select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card,work_experience,is_company_user from app_user
+        select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card,work_experience,is_company_user,dw_userid from app_user
     </sql>
 
     <select id="selectAppUserList" parameterType="AppUser" resultMap="AppUserResult">
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java
index 8e919bb..e6051b1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java
@@ -111,7 +111,7 @@ public class AppUser extends BaseEntity
     /**
      * 是否企业用户 0是，1否改为（0企业，1求职者，2网格员）
      */
-    @ApiModelProperty("app角色：0企业，1求职者，2网格员 3内部政府人员")
+    @ApiModelProperty("app角色：0企业，1求职者，2网格员 3内部政府人员 4其他（浪潮用）")
     private String isCompanyUser;
 
     @TableField(exist = false)
@@ -162,4 +162,7 @@ public class AppUser extends BaseEntity
 
     @ApiModelProperty("户籍地址")
     private String domicileAddress;
+
+    @ApiModelProperty("地纬userid")
+    private String dwUserid;
 }
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 9386f9c..391829f 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
@@ -461,7 +461,7 @@ public class SysLoginService
         updateParm.setUserId(targetUser.getUserId());
 
         String currentRole = targetUser.getIsCompanyUser();
-        if (!StringUtil.IS_GRID_USER.equals(currentRole) && !StringUtil.IS_INTERNAL_USER.equals(currentRole)) {
+        if (currentRole == null || StringUtil.IS_COMPANY_USER.equals(currentRole) || StringUtil.IS_JOB_REQUEST_USER.equals(currentRole)) {
             updateParm.setIsCompanyUser(userType);
             targetUser.setIsCompanyUser(userType);
         }else{