Browse Source

[角色][修改]: 查询返回值修改

release_toaliyun_real
Stormeye.Wu 7 years ago
committed by jinguo24@163.com
parent
commit
a3c9adb3d2
2 changed files with 21 additions and 4 deletions
  1. +20
    -3
      mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java
  2. +1
    -1
      mallinkService/src/main/java/com/simple/domain/po/MallRolePermission.java

+ 20
- 3
mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java View File

@@ -17,6 +17,7 @@ import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;
import com.simple.domain.po.MallRole;
import com.simple.domain.po.MallRolePermission;
import com.simple.service.MallRolePermissionService;
import com.simple.service.MallRoleService;

@@ -40,7 +41,23 @@ public class MallRoleController extends BaseController{

@GetMapping("list")
public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) {
String tenantId = getTenantId();
sysRole.setTenantId(tenantId);
final PageInfo<MallRole> page = sysRoleService.listAsPage(sysRole, pageNum, pageSize);
for(MallRole r:page.getList()) {
MallRolePermission p = new MallRolePermission();
p.setRoleId(r.getId());
p.setTenantId(tenantId);
PageInfo<MallRolePermission> pers = sysRolePermissionService.listAsPage(p, 1, 1000);
String menus ="";
for(MallRolePermission rp:pers.getList()) {
menus+=rp.getPermissionId()+",";
}
if(menus.length()>1) {
menus=menus.substring(0, menus.length()-1);
}
r.setMenus(menus);
}
return new ResultData(page);
}
@@ -88,9 +105,9 @@ public class MallRoleController extends BaseController{

@PostMapping("/del")
public ResultData delete(@RequestBody Long id) {
sysRoleService.deleteById(id);
sysRolePermissionService.deleteByRoleId(id);
public ResultData delete(@RequestBody MallRole sysRole) {
sysRoleService.deleteById(sysRole.getId());
sysRolePermissionService.deleteByRoleId(sysRole.getId());
return new ResultData(Result.SUCCESS, "删除成功", null);
}



+ 1
- 1
mallinkService/src/main/java/com/simple/domain/po/MallRolePermission.java View File

@@ -7,7 +7,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;

@Table(name = "mall_user_role_permission")
@Table(name = "mall_role_permission")
public class MallRolePermission implements Serializable {
private static final long serialVersionUID = 1L;


Loading…
Cancel
Save