用户管理添加数据来源
This commit is contained in:
+12
-4
@@ -189,7 +189,7 @@ public class SysUserController {
|
||||
String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY);
|
||||
String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey));
|
||||
SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
|
||||
|
||||
user.setSource("1");
|
||||
this.setUserInfo(rsaPrivateKey, user);
|
||||
|
||||
// 保存用户走一个service 保证事务
|
||||
@@ -288,10 +288,18 @@ public class SysUserController {
|
||||
if(StringUtils.isBlank(id)){
|
||||
return Result.error("参数不识别!");
|
||||
}
|
||||
baseCommonService.addLog("删除用户,id: " +id ,CommonConstant.LOG_TYPE_2, 3);
|
||||
this.sysUserService.deleteUser(id);
|
||||
return Result.OK("删除用户成功");
|
||||
baseCommonService.addLog("删除用户,id: " +id ,CommonConstant.LOG_TYPE_2, 3);
|
||||
// 验证是否为系统新增
|
||||
SysUser sysUser = sysUserService.getById(id);
|
||||
if(Objects.isNull(sysUser)){
|
||||
return Result.error("数据不存在!");
|
||||
}
|
||||
if(!Objects.equals(sysUser.getSource(),"1")){
|
||||
return Result.error("数据不允许删除!");
|
||||
}
|
||||
this.sysUserService.deleteUser(id);
|
||||
return Result.OK("删除用户成功");
|
||||
}
|
||||
|
||||
@PostMapping("/deleteBatch")
|
||||
@RequiresPermissions("sys:user:sel")
|
||||
|
||||
@@ -264,6 +264,13 @@ public class SysUser implements Serializable {
|
||||
@ApiModelProperty(value = "飞书的id")
|
||||
private String feishuId;
|
||||
|
||||
/**
|
||||
* 数据来源,1:系统新增 其他:IAM对接
|
||||
*/
|
||||
@ApiModelProperty(value = "数据来源,1:系统新增 其他:IAM对接")
|
||||
private String source;
|
||||
|
||||
|
||||
/**
|
||||
* 拼接真实姓名和工号形成唯一的用户信息可用户查看
|
||||
* 不能用get开头,否则会造成初始化queryWrapper的bug
|
||||
|
||||
Reference in New Issue
Block a user