diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index 3f33c2cd..eba62f9b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -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 { @ApiOperation("新增角色") @PostMapping public ResponseMessage addRole(@Validated(TsRole.insert.class) @RequestBody TsRole tsRole){ - //设置操作人 - UserEO userEO=UserUtils.getUser(); - tsRole.setOperator(userEO.getUname()); - return tsRoleService.addRole(tsRole); + QueryWrapper 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("编辑角色") diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index 86f5a6f0..cd17691a 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -461,8 +461,9 @@ AND SAR_LAWS_ITEM_VAL.VALID_FLAG =0 union select count(*) from SAR_BUSSIONESS_STAND - where (SAR_BUSSIONESS_STAND.STAND_GENERA = #{dicTypeCode} or - SAR_BUSSIONESS_STAND.STAND_SUBCLASS = #{dicTypeCode} or + where ( + + SAR_BUSSIONESS_STAND.STAND_STATUS = #{dicTypeCode} or SAR_BUSSIONESS_STAND.STAND_SORT = #{dicTypeCode}) and SAR_BUSSIONESS_STAND.VALID_FLAG =0