zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 新增岗位信息

V0.5.x
jay 2023-06-12 11:26:47 +08:00
parent 98055d9d17
commit 84e8f7c27d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserBo.java
View File

@ -2,10 +2,12 @@ package cc.iotkit.system.dto.bo;
import cc.iotkit.common.api.BaseDto;
import cc.iotkit.common.constant.UserConstants;
import cc.iotkit.common.validate.EditGroup;
import cc.iotkit.model.system.SysUser;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -29,6 +31,7 @@ public class SysUserBo extends BaseDto {
/**
* 用户ID
*/
@NotNull(message = "用户ID不能为空", groups = {EditGroup.class})
private Long id;
/**

5
iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java
View File

@ -18,6 +18,7 @@ import cc.iotkit.system.dto.bo.SysUserBo;
import cc.iotkit.system.dto.vo.SysUserVo;
import cc.iotkit.system.service.ISysUserService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
@ -175,7 +176,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
*/
private void insertUserPost(SysUserBo user, boolean clear) {
List<Long> posts = user.getPostIds();
if (ArrayUtil.isNotEmpty(posts)) {
if (CollectionUtil.isNotEmpty(posts)) {
if (clear) {
// 删除用户与岗位关联
sysUserPostData.deleteByUserId(user.getId());
@ -199,7 +200,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
* @param clear 清除已存在的关联数据
*/
private void insertUserRole(Long userId, List<Long> roleIds, boolean clear) {
if (ArrayUtil.isNotEmpty(roleIds)) {
if (CollectionUtil.isNotEmpty(roleIds)) {
// 判断是否具有此角色的操作权限
List<SysRole> roles = sysRoleData.selectRoleList(new SysRole());
if (CollUtil.isEmpty(roles)) {