lsd/ks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app_user添加dw_userid

Browse Source
This commit is contained in:
sh
2025-12-15 16:39:57 +08:00
parent 461e3adb12
commit 922223c635
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
View File

@@ -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">

5
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java
View File

@@ -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;
}

2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
View File

@@ -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{