diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java index f11f5468e..e1c2e3016 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java @@ -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 page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); + for(MallRole r:page.getList()) { + MallRolePermission p = new MallRolePermission(); + p.setRoleId(r.getId()); + p.setTenantId(tenantId); + PageInfo 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); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/MallRolePermission.java b/mallinkService/src/main/java/com/simple/domain/po/MallRolePermission.java index 3b2baf53f..1a77bd16a 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/MallRolePermission.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallRolePermission.java @@ -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;