配置中新 bug修复 和 角色管理bug修复

This commit is contained in:
yuezhihang
2021-07-29 14:02:40 +08:00
parent af1c3227f6
commit 60dbb8faeb
2 changed files with 16 additions and 6 deletions
@@ -1,6 +1,7 @@
package com.adc.da.slrs.sarRole.controller;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.login.util.UserUtils;
@@ -9,6 +10,7 @@ import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO;
import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO;
import com.adc.da.slrs.sarRole.service.ITsRoleService;
import com.adc.da.sys.entity.UserEO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Delete;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,10 +55,17 @@ public class TsRoleController extends BaseController<TsRole> {
@ApiOperation("新增角色")
@PostMapping
public ResponseMessage<Object> addRole(@Validated(TsRole.insert.class) @RequestBody TsRole tsRole){
//设置操作人
UserEO userEO=UserUtils.getUser();
tsRole.setOperator(userEO.getUname());
return tsRoleService.addRole(tsRole);
QueryWrapper<TsRole> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("NAME",tsRole.getName());
int count = tsRoleService.count(queryWrapper);
if (count>0){
throw new AdcDaBaseException("角色名称已存在,请更换角色名称。");
}else {
//设置操作人
UserEO userEO = UserUtils.getUser();
tsRole.setOperator(userEO.getUname());
return tsRoleService.addRole(tsRole);
}
}
@ApiOperation("编辑角色")