简柏林 / thingskit · Commits

Commit b418ce9ca8e8df45d7ec30c08bc336876998893f

Authored by xp.Huang
1 parent d5cb2cba

fix: 修改允许平台管理员查询所有的菜单，用于租户角色菜单分配

Inline Side-by-side
Showing 3 changed files with 7 additions and 9 deletions
@@ -21,8 +21,6 @@ import org.thingsboard.server.common.data.id.UserId; @@ -21,8 +21,6 @@ import org.thingsboard.server.common.data.id.UserId;
21 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; 21 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
22 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup; 22 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
23 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup; 23 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
24 -import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;  
25 -import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;  
26 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO; 24 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
27 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO; 25 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
28 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO; 26 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
@@ -192,20 +190,20 @@ public class TkAdminController extends BaseController { @@ -192,20 +190,20 @@ public class TkAdminController extends BaseController {
192 @RequestParam(value = "needButton", required = false, defaultValue = "true") 190 @RequestParam(value = "needButton", required = false, defaultValue = "true")
193 boolean needButton) 191 boolean needButton)
194 throws ThingsboardException { 192 throws ThingsboardException {
  193 + boolean isSysAdminOrPtAdmin = getCurrentUser().isPtSysadmin() || getCurrentUser().isPtAdmin();
195 return ResponseEntity.ok( 194 return ResponseEntity.ok(
196 menuService.getMyMenus( 195 menuService.getMyMenus(
197 getCurrentUser().getCurrentTenantId(), 196 getCurrentUser().getCurrentTenantId(),
198 getCurrentUser().getCurrentUserId(), 197 getCurrentUser().getCurrentUserId(),
199 - getCurrentUser().isPtSysadmin(), 198 + isSysAdminOrPtAdmin,
200 getCurrentUser().isPtTenantAdmin(), 199 getCurrentUser().isPtTenantAdmin(),
201 needButton)); 200 needButton));
202 } 201 }
203 202
204 @PutMapping("/menu/assign/{tenantId}") 203 @PutMapping("/menu/assign/{tenantId}")
205 public void assignMenuToTenant( 204 public void assignMenuToTenant(
206 - @RequestBody String[] menuIds, @PathVariable("tenantId") String tenantId)  
207 - throws ThingsboardException {  
208 - menuService.assignMenuToTenant(getCurrentUser().getCurrentTenantId(), menuIds); 205 + @RequestBody String[] menuIds, @PathVariable("tenantId") String tenantId){
  206 + menuService.assignMenuToTenant(tenantId, menuIds);
209 } 207 }
210 208
211 @PostMapping("tenant/updateOrCreateTenant") 209 @PostMapping("tenant/updateOrCreateTenant")
@@ -44,11 +44,11 @@ public class SysMenuServiceImpl extends AbstractBaseService<MenuMapper, SysMenuE @@ -44,11 +44,11 @@ public class SysMenuServiceImpl extends AbstractBaseService<MenuMapper, SysMenuE
44 public List<MenuDTO> getMyMenus( 44 public List<MenuDTO> getMyMenus(
45 String tenantId, 45 String tenantId,
46 String userId, 46 String userId,
47 - boolean isSysAdmin, 47 + boolean isSysAdminOrPtAdmin,
48 boolean isTenantAdmin, 48 boolean isTenantAdmin,
49 boolean needButton) { 49 boolean needButton) {
50 List<MenuDTO> menuDTOs; 50 List<MenuDTO> menuDTOs;
51 - if (isSysAdmin) { 51 + if (isSysAdminOrPtAdmin) {
52 menuDTOs = baseMapper.selectSysAdminMenu(); 52 menuDTOs = baseMapper.selectSysAdminMenu();
53 } else if (isTenantAdmin) { 53 } else if (isTenantAdmin) {
54 menuDTOs = baseMapper.selectTenantMenu(tenantId); 54 menuDTOs = baseMapper.selectTenantMenu(tenantId);
@@ -19,7 +19,7 @@ public interface MenuService { @@ -19,7 +19,7 @@ public interface MenuService {
19 * @return list 树状menu 19 * @return list 树状menu
20 */ 20 */
21 List<MenuDTO> getMyMenus( 21 List<MenuDTO> getMyMenus(
22 - String tenantId, String userId, boolean isPtSysAdmin, boolean isPtTenantAdmin,boolean needButton); 22 + String tenantId, String userId, boolean isPtSysAdmin, boolean isSysAdminOrPtAdmin,boolean needButton);
23 23
24 MenuDTO saveMenu(String tenantId, boolean isPtSysAdmin, MenuDTO menuDTO); 24 MenuDTO saveMenu(String tenantId, boolean isPtSysAdmin, MenuDTO menuDTO);
25 25