Преглед изворни кода

[A端][修复]:解决角色不能被删除的问题

release_toaliyun_real
hupeng пре 7 година
родитељ
комит
ca7bdb9a4b
4 измењених фајлова са 17 додато и 9 уклоњено
  1. +7
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java
  3. +4
    -2
      mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java
  4. +5
    -2
      mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java

+ 7
- 4
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.MallRole;
import com.iformall.domain.po.MallRolePermission; import com.iformall.domain.po.MallRolePermission;
import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.MallUserRole;
import com.iformall.enums.EnumUserAdmin; import com.iformall.enums.EnumUserAdmin;
import com.iformall.service.MallRolePermissionService; import com.iformall.service.MallRolePermissionService;
import com.iformall.service.MallRoleService; import com.iformall.service.MallRoleService;
import com.iformall.service.MallUserInfoService; import com.iformall.service.MallUserInfoService;
import com.iformall.service.MallUserRoleService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@@ -41,6 +43,9 @@ public class MallRoleController extends BaseController {
@Autowired @Autowired
private MallUserInfoService mallUserInfoService; private MallUserInfoService mallUserInfoService;


@Autowired
private MallUserRoleService mallUserRoleService;

@GetMapping("list") @GetMapping("list")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @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())) { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.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.setRoleId(sysRole.getId());
record.setIsAdmin(EnumUserAdmin.Normal.getCode());
int count = mallUserInfoService.cntUserList(record);
int count = mallUserRoleService.cntUserList(record);
if (count > 0) { if (count > 0) {
return new ResultData(ErrorCode.USER_USE_ROLE.getCode(), "有用户使用此角色,请先删除相应的用户!!"); return new ResultData(ErrorCode.USER_USE_ROLE.getCode(), "有用户使用此角色,请先删除相应的用户!!");
} }


+ 1
- 1
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(), "用户不能删除自己"); return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "用户不能删除自己");
} }
userInfoService.deleteById(userInfo.getId()); userInfoService.deleteById(userInfo.getId());
userRoleService.deleteByUserId(userInfo.getId());
return new ResultData(); return new ResultData();
} }




+ 4
- 2
mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java Прегледај датотеку

@@ -44,8 +44,10 @@ public interface MallUserRoleService {
* @param u2rs * @param u2rs
*/ */
void batchInsert(List<MallUserRole> u2rs); void batchInsert(List<MallUserRole> u2rs);


int cntUserList(MallUserRole record);



void deleteByUserId(Long uid); void deleteByUserId(Long uid);


+ 5
- 2
mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java Прегледај датотеку

@@ -47,8 +47,11 @@ public class MallUserRoleServiceImpl implements MallUserRoleService {
public void deleteById(Long id) { public void deleteById(Long id) {
mallUserRoleMapper.deleteByPrimaryKey(id); mallUserRoleMapper.deleteByPrimaryKey(id);
} }

@Override
public int cntUserList(MallUserRole record) {
return mallUserRoleMapper.selectCount(record);
}
@Override @Override


Loading…
Откажи
Сачувај