|
|
|
@@ -7,10 +7,12 @@ import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.MallRole; |
|
|
|
import com.iformall.domain.po.MallRolePermission; |
|
|
|
import com.iformall.domain.po.MallUserInfo; |
|
|
|
import com.iformall.domain.po.MallUserRole; |
|
|
|
import com.iformall.enums.EnumUserAdmin; |
|
|
|
import com.iformall.service.MallRolePermissionService; |
|
|
|
import com.iformall.service.MallRoleService; |
|
|
|
import com.iformall.service.MallUserInfoService; |
|
|
|
import com.iformall.service.MallUserRoleService; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
@@ -41,6 +43,9 @@ public class MallRoleController extends BaseController { |
|
|
|
@Autowired |
|
|
|
private MallUserInfoService mallUserInfoService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private MallUserRoleService mallUserRoleService; |
|
|
|
|
|
|
|
@GetMapping("list") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@@ -130,11 +135,9 @@ public class MallRoleController extends BaseController { |
|
|
|
if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { |
|
|
|
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能删除角色"); |
|
|
|
} |
|
|
|
MallUserInfo record = new MallUserInfo(); |
|
|
|
record.setTenantId(currentUser.getTenantId()); |
|
|
|
MallUserRole record = new MallUserRole(); |
|
|
|
record.setRoleId(sysRole.getId()); |
|
|
|
record.setIsAdmin(EnumUserAdmin.Normal.getCode()); |
|
|
|
int count = mallUserInfoService.cntUserList(record); |
|
|
|
int count = mallUserRoleService.cntUserList(record); |
|
|
|
if (count > 0) { |
|
|
|
return new ResultData(ErrorCode.USER_USE_ROLE.getCode(), "有用户使用此角色,请先删除相应的用户!!"); |
|
|
|
} |
|
|
|
|