sugus/aircraft-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理

Browse Source
This commit is contained in:
lihongbiao 2025-07-18 21:39:38 +08:00
parent 1140af3199
commit c2020812eb
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/UserServiceImpl.java
View File

@ -81,7 +81,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
user.setAreaName(areaService.findById(user.getAreaId()).getName());
}
if (user.getScenicId() != null) {
user.setScenicName(scenicService.findByAreaIdAndName(user.getScenicId(), user.getAreaName()).getName());
user.setScenicName(scenicService.getById(user.getScenicId()).getName());
}
}
Long total = userMapper.countAll(criteria);
@ -169,12 +169,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
if(!resources.getEnabled()){
onlineUserService.kickOutForUsername(resources.getUsername());
}
// user.setDeptId(resources.getDept().getId());
user.setQualification(resources.getQualification());
user.setQualificationAttachment(resources.getQualificationAttachment());
user.setUsername(resources.getUsername());
// user.setEmail(resources.getEmail());
user.setScenicId(resources.getScenicId());
user.setEnabled(resources.getEnabled());
user.setRoles(resources.getRoles());
// user.setDept(resources.getDept());
user.setAreaId(resources.getAreaId());
user.setJobs(resources.getJobs());
user.setPhone(resources.getPhone());
user.setNickName(resources.getNickName());

17
aircraft-system/src/main/resources/mapper/system/UserMapper.xml
View File

@ -20,6 +20,10 @@
<result column="user_update_by" property="updateBy"/>
<result column="user_create_time" property="createTime"/>
<result column="user_update_time" property="updateTime"/>
<result column="user_area_id" property="areaId"/>
<result column="user_scenic_id" property="scenicId"/>
<result column="user_qualification" property="qualification"/>
<result column="user_qualificationAttachment" property="qualificationAttachment"/>
<association property="dept" javaType="com.aircraft.modules.system.domain.Dept">
<id column="dept_id" property="id"/>
<result column="dept_name" property="name"/>
@ -42,7 +46,8 @@
u.gender as user_gender, u.avatar_name as user_avatar_name, u.avatar_path as user_avatar_path,
u.enabled as user_enabled, u.pwd_reset_time as user_pwd_reset_time, u.create_by as user_create_by,
u.update_by as user_update_by, u.create_time as user_create_time, u.update_time as user_update_time,
d.dept_id as dept_id, d.name as dept_name
u.area_id as user_area_id, u.scenic_id as user_scenic_id,
u.qualification as user_qualification, u.qualification_attachment as user_qualification_attachment
</sql>
<sql id="Job_Column_List">
@ -62,12 +67,6 @@
<if test="criteria.enabled != null">
and u.enabled = #{criteria.enabled}
</if>
<if test="criteria.deptIds != null and criteria.deptIds.size() != 0">
and u.dept_id in
<foreach collection="criteria.deptIds" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
</if>
<if test="criteria.blurry != null and criteria.blurry != ''">
and (
u.username like concat('%', #{criteria.blurry}, '%')
@ -83,21 +82,17 @@
<select id="findAll" resultMap="BaseResultMap">
select u.*,
<include refid="Job_Column_List"/>,
<include refid="Role_Column_List"/>
from (
select
<include refid="Base_Column_List"/>
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
<include refid="Whrer_Sql"/>
order by u.user_id desc
<if test="criteria.offset != null">
limit #{criteria.offset}, #{criteria.size}
</if>
) u
left join sys_users_jobs suj on u.user_user_id = suj.user_id
left join sys_job j on suj.job_id = j.job_id
left join sys_users_roles sur on u.user_user_id = sur.user_id
left join sys_role r on sur.role_id = r.role_id
order by u.user_user_id desc