From 254e0ac2336704785e34378784dd6c103db6de33 Mon Sep 17 00:00:00 2001 From: lihongbiao <964708803@qq.com> Date: Sat, 19 Jul 2025 21:08:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/UserDetailsServiceImpl.java | 6 +- .../controller/EmEmployeesController.java | 59 ++++--- .../modules/system/domain/EmEmployees.java | 19 +- .../aircraft/modules/system/domain/User.java | 12 +- .../system/domain/vo/EmEmployeesDetailVo.java | 3 - .../modules/system/rest/UserController.java | 26 +-- .../system/service/EmEmployeesService.java | 67 ++++--- .../service/impl/EmEmployeesServiceImpl.java | 165 +++++++----------- .../system/service/impl/UserServiceImpl.java | 47 +---- .../resources/mapper/EmEmployeesMapper.xml | 18 +- .../resources/mapper/system/UserMapper.xml | 30 ++-- 11 files changed, 195 insertions(+), 257 deletions(-) diff --git a/aircraft-system/src/main/java/com/aircraft/modules/security/service/UserDetailsServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/security/service/UserDetailsServiceImpl.java index 8ebde28..e82935a 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/security/service/UserDetailsServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/security/service/UserDetailsServiceImpl.java @@ -63,9 +63,9 @@ public class UserDetailsServiceImpl implements UserDetailsService { // 获取用户的权限 List authorities = roleService.buildPermissions(user); EmEmployees emEmployees = null; - if (user.getUserType()==1) { - emEmployees = emEmployeesService.findByUserId(user.getId()); - } +// if (user.getUserType()==1) { +// emEmployees = emEmployeesService.findByUserId(user.getId()); +// } // 初始化JwtUserDto jwtUserDto = new JwtUserDto(BeanUtil.copyProperties(user, LoginUserDto.class), UserTypeEnum.getByValue(user.getUserType()),dataService.getDeptIds(user), authorities,emEmployees); // 添加缓存数据 diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java index b8d8466..c3c5aa1 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java @@ -28,6 +28,7 @@ import com.aircraft.modules.security.service.dto.AuthUserDto; import com.aircraft.modules.security.service.dto.JwtUserDto; import com.aircraft.modules.system.domain.EmEmployees; import com.aircraft.modules.system.domain.User; +import com.aircraft.modules.system.domain.dto.EmEmployeesQueryCriteria; import com.aircraft.modules.system.domain.dto.UserPassVo; import com.aircraft.modules.system.domain.vo.EmEmployeesDetailVo; import com.aircraft.modules.system.domain.vo.EmEmployeesVo; @@ -36,12 +37,14 @@ import com.aircraft.modules.system.service.UserService; import com.aircraft.utils.*; import com.aircraft.utils.enums.UserTypeEnum; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import java.util.HashMap; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.password.PasswordEncoder; @@ -49,8 +52,10 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.*; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** @@ -79,7 +84,7 @@ public class EmEmployeesController { // public void exportEmEmployees(HttpServletResponse response, EmEmployeesQueryCriteria criteria) throws IOException { // emEmployeesService.download(emEmployeesService.queryAll(criteria), response); // } -// + // @GetMapping // @ApiOperation("查询员工管理") // @PreAuthorize("@el.check('emEmployees:list')") @@ -87,16 +92,16 @@ public class EmEmployeesController { // Page page = new Page<>(criteria.getPage(), criteria.getSize()); // return new ResponseEntity<>(emEmployeesService.queryAll(criteria,page),HttpStatus.OK); // } -// -// @PostMapping -// @Log("新增员工管理") -// @ApiOperation("新增员工管理") -// @PreAuthorize("@el.check('emEmployees:add')") -// public ResponseEntity createEmEmployees(@Validated @RequestBody EmEmployeesVo resources){ -// emEmployeesService.create(resources); -// return new ResponseEntity<>(HttpStatus.CREATED); -// } -// + + @PostMapping + @Log("新增员工管理") + @ApiOperation("新增员工管理") + @PreAuthorize("@el.check('emEmployees:add')") + public ResponseEntity createEmEmployees(@Validated @RequestBody EmEmployeesVo resources){ + emEmployeesService.create(resources); + return new ResponseEntity<>(HttpStatus.CREATED); + } + @PutMapping @Log("设置个人信息") @ApiOperation("设置个人信息") @@ -111,7 +116,7 @@ public class EmEmployeesController { @ApiImplicitParam(name = "id", value = "飞行员id", required = true, paramType = "path") public ResponseEntity one(@PathVariable final Integer id) { try { - EmEmployees emEmployees = JSON.parseObject(SecurityUtils.getCurrentEmployee(), EmEmployees.class); +// EmEmployees emEmployees = JSON.parseObject(SecurityUtils.getCurrentEmployee(), EmEmployees.class); EmEmployeesDetailVo entity = emEmployeesService.findById(id); return new ResponseEntity<>(entity,HttpStatus.OK); } catch (Exception e) { @@ -136,22 +141,22 @@ public class EmEmployeesController { return new ResponseEntity<>(HttpStatus.OK); } -// -// @DeleteMapping -// @Log("删除员工管理") -// @ApiOperation("删除员工管理") -// @PreAuthorize("@el.check('emEmployees:del')") -// public ResponseEntity deleteEmEmployees(@ApiParam(value = "传ID数组[]") @RequestBody List ids) { -// emEmployeesService.deleteAll(ids); -// return new ResponseEntity<>(HttpStatus.OK); -// } -// @GetMapping("findByPage") -// @ApiOperation("分页查询员工管理") -// public ResponseEntity> findByPage(final EmEmployeesDetailVo example, final Page page){ -// PageResult records = emEmployeesService.page(example,page); -// return new ResponseEntity<>(records,HttpStatus.OK); -// } + @DeleteMapping + @Log("删除员工管理") + @ApiOperation("删除员工管理") + @PreAuthorize("@el.check('emEmployees:del')") + public ResponseEntity deleteEmEmployees(@ApiParam(value = "传ID数组[]") @RequestBody List ids) { + emEmployeesService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @GetMapping("findByPage") + @ApiOperation("分页查询员工管理") + public ResponseEntity> findByPage(final EmEmployeesDetailVo example, final Page page){ + PageResult records = emEmployeesService.page(example,page); + return new ResponseEntity<>(records,HttpStatus.OK); + } @Log("用户登录") @ApiOperation("登录授权") diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/EmEmployees.java b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/EmEmployees.java index 72ecfaa..6cd3eab 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/EmEmployees.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/EmEmployees.java @@ -16,6 +16,7 @@ package com.aircraft.modules.system.domain; import com.aircraft.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import cn.hutool.core.bean.BeanUtil; import io.swagger.annotations.ApiModelProperty; @@ -48,12 +49,24 @@ public class EmEmployees extends BaseEntity { @ApiModelProperty(value = "员工状态") private String status; - @ApiModelProperty(value = "userid") - private Long userid; - @ApiModelProperty(value = "入职时间") private Timestamp hireDate; + @ApiModelProperty(value = "飞行资质") + private String qualification; + + @ApiModelProperty(value = "飞行资质附件") + private String qualificationAttachment; + + @ApiModelProperty(value = "区域id") + private Long areaId; + + @ApiModelProperty(value = "景区id") + private Long scenicId; + + @ApiModelProperty(value = "密码") + private String password; + public void copy(EmEmployees source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/User.java b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/User.java index 3eac1ec..139c78a 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/User.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/User.java @@ -73,9 +73,9 @@ public class User extends BaseEntity implements Serializable { @ApiModelProperty(value = "用户昵称") private String nickName; - @Email - @ApiModelProperty(value = "邮箱") - private String email; +// @Email +// @ApiModelProperty(value = "邮箱") +// private String email; @NotBlank @ApiModelProperty(value = "电话号码") @@ -109,12 +109,6 @@ public class User extends BaseEntity implements Serializable { @ApiModelProperty(value = "景区id") private Long scenicId; - @ApiModelProperty(value = "飞行资质") - private String qualification; - - @ApiModelProperty(value = "飞行资质附件") - private String qualificationAttachment; - @TableField(exist = false) @ApiModelProperty(value = "区域名称") private String areaName; diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/vo/EmEmployeesDetailVo.java b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/vo/EmEmployeesDetailVo.java index 7edf6cf..627b23d 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/vo/EmEmployeesDetailVo.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/vo/EmEmployeesDetailVo.java @@ -14,8 +14,5 @@ public class EmEmployeesDetailVo extends EmEmployees { @ApiModelProperty(value = "景区名称") private String scenicName; - @ApiModelProperty(value = "用户性别") - private String gender; - } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/rest/UserController.java b/aircraft-system/src/main/java/com/aircraft/modules/system/rest/UserController.java index bd8339b..4667787 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/rest/UserController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/rest/UserController.java @@ -182,19 +182,19 @@ public class UserController { return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK); } - @Log("修改邮箱") - @ApiOperation("修改邮箱") - @PostMapping(value = "/updateEmail/{code}") - public ResponseEntity updateUserEmail(@PathVariable String code, @RequestBody User resources) throws Exception { - String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,resources.getPassword()); - User user = userService.findByName(SecurityUtils.getCurrentUsername()); - if(!passwordEncoder.matches(password, user.getPassword())){ - throw new BadRequestException("密码错误"); - } - verificationCodeService.validated(CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey() + resources.getEmail(), code); - userService.updateEmail(user.getUsername(),resources.getEmail()); - return new ResponseEntity<>(HttpStatus.OK); - } +// @Log("修改邮箱") +// @ApiOperation("修改邮箱") +// @PostMapping(value = "/updateEmail/{code}") +// public ResponseEntity updateUserEmail(@PathVariable String code, @RequestBody User resources) throws Exception { +// String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,resources.getPassword()); +// User user = userService.findByName(SecurityUtils.getCurrentUsername()); +// if(!passwordEncoder.matches(password, user.getPassword())){ +// throw new BadRequestException("密码错误"); +// } +// verificationCodeService.validated(CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey() + resources.getEmail(), code); +// userService.updateEmail(user.getUsername(),resources.getEmail()); +// return new ResponseEntity<>(HttpStatus.OK); +// } /** * 如果当前用户的角色级别低于创建用户的角色级别，则抛出权限不足的错误 diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/EmEmployeesService.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/EmEmployeesService.java index 565bd74..8222081 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/service/EmEmployeesService.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/EmEmployeesService.java @@ -51,53 +51,46 @@ public interface EmEmployeesService extends IService { */ List queryAll(EmEmployeesQueryCriteria criteria); -// /** -// * 创建 -// * @param resources / -// */ -// void create(EmEmployeesVo resources); -// + /** + * 创建 + * @param resources / + */ + void create(EmEmployeesVo resources); + /** * 编辑 * @param resources / */ void update(EmEmployeesVo resources); -// -// /** -// * 多选删除 -// * @param ids / -// */ -// void deleteAll(List ids); -// -// /** -// * 导出数据 -// * @param all 待导出的数据 -// * @param response / -// * @throws IOException / -// */ -// void download(List all, HttpServletResponse response) throws IOException; -// -// /** -// * 分页查询 -// * @param example -// * @param page -// * @return -// */ -// PageResult page(EmEmployeesDetailVo example, Page page); -// -// /** -// * 获取景区下的用户 -// * @param id -// * @return -// */ -// List findByScenicId(Long id); /** - * 根据userid查找用户 + * 多选删除 + * @param ids / + */ + void deleteAll(List ids); + + /** + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; + + /** + * 分页查询 + * @param example + * @param page + * @return + */ + PageResult page(EmEmployeesDetailVo example, Page page); + + /** + * 获取景区下的用户 * @param id * @return */ - EmEmployees findByUserId(Long id); + List findByScenicId(Long id); /** * 查询详细信息 diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java index 5d1287e..ec6d40d 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java @@ -15,17 +15,15 @@ */ package com.aircraft.modules.system.service.impl; -import com.aircraft.exception.EntityExistException; +import com.aircraft.base.BaseEntity; import com.aircraft.modules.security.service.UserCacheManager; import com.aircraft.modules.system.domain.EmEmployees; import com.aircraft.modules.system.domain.vo.EmEmployeesDetailVo; import com.aircraft.modules.system.domain.vo.EmEmployeesVo; import com.aircraft.modules.system.domain.User; import com.aircraft.modules.system.mapper.UserMapper; -import com.aircraft.modules.system.mapper.UserRoleMapper; import com.aircraft.modules.system.service.EmAreaService; import com.aircraft.modules.system.service.EmScenicService; -import com.aircraft.modules.system.service.UserService; import com.aircraft.utils.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; @@ -35,8 +33,7 @@ import com.aircraft.modules.system.service.EmEmployeesService; import com.aircraft.modules.system.domain.dto.EmEmployeesQueryCriteria; import com.aircraft.modules.system.mapper.EmEmployeesMapper; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -59,6 +56,7 @@ public class EmEmployeesServiceImpl extends ServiceImpl queryAll(EmEmployeesQueryCriteria criteria, Page page){ @@ -70,33 +68,24 @@ public class EmEmployeesServiceImpl extends ServiceImpl ids) { -// Set userIds = new HashSet<>(); -// for (Long id : ids) { -// EmEmployees emEmployees = getById(id); -// emEmployees.setDelFlag(1); -// emEmployeesMapper.updateById(emEmployees); -// // 清理缓存 -// User user = userService.getById(emEmployees.getUserid()); -// userService.delCaches(user.getId(), user.getUsername()); -// userIds.add(emEmployees.getUserid()); -// } -// userMapper.deleteBatchIds(ids); -// // 删除用户角色 -// userRoleMapper.deleteByUserIds(userIds); -// } -// -// @Override -// public void download(List all, HttpServletResponse response) throws IOException { -// List> list = new ArrayList<>(); -// for (EmEmployees emEmployees : all) { -// Map map = new LinkedHashMap<>(); -// map.put("姓名", emEmployees.getName()); -// map.put("电话", emEmployees.getPhone()); -// map.put("员工状态", emEmployees.getStatus()); -// map.put("创建时间", emEmployees.getCreateTime()); -// map.put("更新时间", emEmployees.getUpdateTime()); -// map.put("userid", emEmployees.getUserid()); -// list.add(map); -// } -// FileUtil.downloadExcel(list, response); -// } -// -// @Override -// public PageResult page(EmEmployeesDetailVo example, Page page) { -// page.setOptimizeCountSql(false); -// return PageUtil.toPage(this.baseMapper.findByExample(buildWrapper(example),page)); -// } -// -// /** -// * 构建查询 -// * -// * @param example -// * @return -// */ -// private QueryWrapper buildWrapper(EmEmployeesDetailVo example) { -// String name = example.getName(); -// QueryWrapper wrapper = new QueryWrapper<>(); -// wrapper.lambda() -// .like(StringUtils.isNotEmpty(name), EmEmployees::getName, name); -// return wrapper; -// } -// -// @Override -// public List findByScenicId(Long areaId) { -// QueryWrapper wrapper = new QueryWrapper<>(); -// wrapper.lambda() -// .eq(EmEmployees::getAreaId, areaId) -// .eq(EmEmployees::getDelFlag, 0); -// return super.list(wrapper); -// } -// + @Override - public EmEmployees findByUserId(Long id) { + @Transactional(rollbackFor = Exception.class) + public void deleteAll(List ids) { + this.removeByIds(ids); + } + + @Override + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (EmEmployees emEmployees : all) { + Map map = new LinkedHashMap<>(); + map.put("姓名", emEmployees.getName()); + map.put("电话", emEmployees.getPhone()); + map.put("员工状态", emEmployees.getStatus()); + map.put("创建时间", emEmployees.getCreateTime()); + map.put("更新时间", emEmployees.getUpdateTime()); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } + + @Override + public PageResult page(EmEmployeesDetailVo example, Page page) { + page.setOptimizeCountSql(false); + return PageUtil.toPage(this.baseMapper.findByExample(buildWrapper(example),page)); + } + + /** + * 构建查询 + * + * @param example + * @return + */ + private QueryWrapper buildWrapper(EmEmployeesDetailVo example) { + String name = example.getName(); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda() + .like(StringUtils.isNotEmpty(name), EmEmployees::getName, name) + .eq(BaseEntity::getDelFlag,0); + return wrapper; + } + + @Override + public List findByScenicId(Long areaId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.lambda() - .eq(EmEmployees::getUserid,id); - return this.baseMapper.selectOne(wrapper); + .eq(EmEmployees::getAreaId, areaId) + .eq(EmEmployees::getDelFlag, 0); + return super.list(wrapper); } @Override @@ -200,12 +169,10 @@ public class EmEmployeesServiceImpl extends ServiceImpl implements UserService { private final UserMapper userMapper; - private final UserJobMapper userJobMapper; + private final PasswordEncoder passwordEncoder; private final UserRoleMapper userRoleMapper; private final FileProperties properties; private final RedisUtils redisUtils; @@ -68,22 +64,11 @@ public class UserServiceImpl extends ServiceImpl implements Us private final OnlineUserService onlineUserService; private final EmAreaService areaService; private final EmScenicService scenicService; - @Lazy - @Autowired - private final EmEmployeesService employeesService; @Override public PageResult queryAll(UserQueryCriteria criteria, Page page) { criteria.setOffset(page.offset()); List users = userMapper.findAll(criteria); - for (User user : users) { - if (user.getAreaId() != null) { - user.setAreaName(areaService.findById(user.getAreaId()).getName()); - } - if (user.getScenicId() != null) { - user.setScenicName(scenicService.getById(user.getScenicId()).getName()); - } - } Long total = userMapper.countAll(criteria); return PageUtil.toPage(users, total); } @@ -121,14 +106,9 @@ public class UserServiceImpl extends ServiceImpl implements Us throw new EntityExistException(User.class, "phone", resources.getPhone()); } save(resources); - if (Objects.equals(UserTypeEnum.getByValue(resources.getUserType()), UserTypeEnum.EMPLOYEES)) { - EmEmployees emEmployees = new EmEmployees(); - emEmployees.setDelFlag(0); - emEmployees.setPhone(resources.getPhone()); - emEmployees.setName(resources.getNickName()); - emEmployees.setUserid(resources.getId()); - employeesService.save(emEmployees); - } +// if (Objects.equals(UserTypeEnum.getByValue(resources.getUserType()), UserTypeEnum.EMPLOYEES)) { +// EmEmployees emEmployees = new EmEmployees(); +// } // 保存用户角色 userRoleMapper.insertData(resources.getId(), resources.getRoles()); } @@ -156,8 +136,7 @@ public class UserServiceImpl extends ServiceImpl implements Us if(!resources.getEnabled()){ onlineUserService.kickOutForUsername(resources.getUsername()); } - user.setQualification(resources.getQualification()); - user.setQualificationAttachment(resources.getQualificationAttachment()); + user.setPassword(passwordEncoder.encode(RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,resources.getPassword()))); user.setUsername(resources.getUsername()); user.setScenicId(resources.getScenicId()); user.setEnabled(resources.getEnabled()); @@ -168,12 +147,6 @@ public class UserServiceImpl extends ServiceImpl implements Us user.setNickName(resources.getNickName()); user.setGender(resources.getGender()); saveOrUpdate(user); - if (Objects.equals(UserTypeEnum.getByValue(resources.getUserType()), UserTypeEnum.EMPLOYEES)) { - EmEmployees emEmployees = employeesService.findByUserId(resources.getId()); - emEmployees.setPhone(resources.getPhone()); - emEmployees.setName(resources.getNickName()); - employeesService.saveOrUpdate(emEmployees); - } // 清除缓存 delCaches(user.getId(), user.getUsername()); // 更新用户角色 @@ -203,10 +176,6 @@ public class UserServiceImpl extends ServiceImpl implements Us for (Long id : ids) { // 清理缓存 User user = getById(id); - if (Objects.equals(UserTypeEnum.getByValue(user.getUserType()), UserTypeEnum.EMPLOYEES)) { - EmEmployees emEmployees = employeesService.findByUserId(id); - employeesService.removeById(emEmployees.getId()); - } delCaches(user.getId(), user.getUsername()); } userMapper.deleteBatchIds(ids); @@ -290,7 +259,7 @@ public class UserServiceImpl extends ServiceImpl implements Us map.put("角色", roles); map.put("部门", user.getDept().getName()); map.put("岗位", user.getJobs().stream().map(Job::getName).collect(Collectors.toList())); - map.put("邮箱", user.getEmail()); +// map.put("邮箱", user.getEmail()); map.put("状态", user.getEnabled() ? "启用" : "禁用"); map.put("手机号码", user.getPhone()); map.put("修改密码的时间", user.getPwdResetTime()); diff --git a/aircraft-system/src/main/resources/mapper/EmEmployeesMapper.xml b/aircraft-system/src/main/resources/mapper/EmEmployeesMapper.xml index 8eaf695..5324e41 100644 --- a/aircraft-system/src/main/resources/mapper/EmEmployeesMapper.xml +++ b/aircraft-system/src/main/resources/mapper/EmEmployeesMapper.xml @@ -42,8 +42,6 @@ SELECT id, name, phone, - gender, - department_id, status, create_time, update_time, @@ -53,13 +51,11 @@ qualification_attachment, areaName, scenicName, - roleName, - username + username, + del_flag FROM (SELECT em_employees.id as id, em_employees.name as name, em_employees.phone as phone, - em_employees.gender as gender, - em_employees.department_id as department_id, em_employees.status as status, em_employees.create_time as create_time, em_employees.update_time as update_time, @@ -69,14 +65,10 @@ em_employees.qualification_attachment as qualification_attachment, em_area.name as areaName, em_scenic.name as scenicName, - sys_user.username as username, - sys_role.name as roleName + em_employees.username as username, + em_employees.del_flag as del_flag FROM em_employees - LEFT JOIN em_area - ON em_area.id = em_employees.area_id - left join sys_user on sys_user.user_id = em_employees.user_id - left join sys_users_roles on sys_users_roles.user_id = em_employees.user_id - left join sys_role on sys_users_roles.role_id = sys_role.role_id + LEFT JOIN em_area ON em_area.id = em_employees.area_id left join em_scenic on em_scenic.id = em_employees.scenic_id) t ${ew.customSqlSegment} diff --git a/aircraft-system/src/main/resources/mapper/system/UserMapper.xml b/aircraft-system/src/main/resources/mapper/system/UserMapper.xml index 91bc1b0..e1fe26a 100644 --- a/aircraft-system/src/main/resources/mapper/system/UserMapper.xml +++ b/aircraft-system/src/main/resources/mapper/system/UserMapper.xml @@ -7,7 +7,7 @@ - + @@ -22,8 +22,8 @@ - - + + @@ -41,19 +41,23 @@ - u.user_id as user_user_id,u.user_type as user_type, u.dept_id as user_dept_id, u.username as user_username, - u.nick_name as user_nick_name, u.email as user_email, u.phone as user_phone, - 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, - 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 + u.user_id as user_user_id, u.user_type as user_type, u.dept_id as user_dept_id, u.username as user_username, + u.nick_name as user_nick_name, u.email as user_email, u.phone as user_phone, + 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, + u.area_id as user_area_id, u.scenic_id as user_scenic_id j.job_id as job_id, j.name as job_name - + + a.name as area_name + + + s.name as scenic_name + r.role_id as role_id, r.name as role_name, r.level as role_level, r.data_scope as role_data_scope @@ -82,6 +86,8 @@