diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java index a909a7a10..b134be8b2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java @@ -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(), "有用户使用此角色,请先删除相应的用户!!"); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java index d4b966de0..b1defd86c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java @@ -196,7 +196,7 @@ public class MallUserInfoController extends BaseController { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "用户不能删除自己"); } userInfoService.deleteById(userInfo.getId()); - + userRoleService.deleteByUserId(userInfo.getId()); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java b/mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java index 3ca518517..9844f5857 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java @@ -44,8 +44,10 @@ public interface MallUserRoleService { * @param u2rs */ void batchInsert(List u2rs); - - + + + int cntUserList(MallUserRole record); + void deleteByUserId(Long uid); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java index 8b3e9caa6..44f96e911 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java @@ -47,8 +47,11 @@ public class MallUserRoleServiceImpl implements MallUserRoleService { public void deleteById(Long id) { mallUserRoleMapper.deleteByPrimaryKey(id); } - - + + @Override + public int cntUserList(MallUserRole record) { + return mallUserRoleMapper.selectCount(record); + } @Override