diff --git a/coder-common-thin-modules/coder-common-thin-system/src/main/java/org/leocoder/thin/system/controller/menu/SysMenuController.java b/coder-common-thin-modules/coder-common-thin-system/src/main/java/org/leocoder/thin/system/controller/menu/SysMenuController.java index cf44f34..368cf7f 100755 --- a/coder-common-thin-modules/coder-common-thin-system/src/main/java/org/leocoder/thin/system/controller/menu/SysMenuController.java +++ b/coder-common-thin-modules/coder-common-thin-system/src/main/java/org/leocoder/thin/system/controller/menu/SysMenuController.java @@ -19,6 +19,7 @@ import org.leocoder.thin.common.satoken.CoderLoginUtil; import org.leocoder.thin.domain.enums.oper.OperType; import org.leocoder.thin.domain.model.bo.element.CascaderLongBo; import org.leocoder.thin.domain.model.bo.system.SysMenuBo; +import org.leocoder.thin.domain.model.bo.system.SysRoleMenuBo; import org.leocoder.thin.domain.model.vo.system.SysMenuVo; import org.leocoder.thin.domain.pojo.system.SysMenu; import org.leocoder.thin.operlog.annotation.OperLog; @@ -274,10 +275,10 @@ public class SysMenuController { */ @Operation(summary = "保存角色菜单权限", description = "保存角色和菜单权限之间的关联关系") @SaCheckPermission("system:role:menu") - @PostMapping("/sysMenu/saveRoleMenu/{roleId}/{menuIds}") + @PostMapping("/sysMenu/saveRoleMenu") @OperLog(value = "保存角色菜单权限", operType = OperType.UPDATE) - public void saveRoleMenu(@PathVariable("roleId") Long roleId, @PathVariable("menuIds") List menuIds) { - sysMenuService.saveRoleMenu(roleId, menuIds); + public void saveRoleMenu(@Validated @RequestBody SysRoleMenuBo roleMenuBo) { + sysMenuService.saveRoleMenu(roleMenuBo.getRoleIdAsLong(), roleMenuBo.getMenuIdsAsLong()); } } diff --git a/coder-common-thin-modules/coder-common-thin-system/src/main/java/org/leocoder/thin/system/controller/picture/SysPictureController.java b/coder-common-thin-modules/coder-common-thin-system/src/main/java/org/leocoder/thin/system/controller/picture/SysPictureController.java index 73a5d14..030a2f7 100755 --- a/coder-common-thin-modules/coder-common-thin-system/src/main/java/org/leocoder/thin/system/controller/picture/SysPictureController.java +++ b/coder-common-thin-modules/coder-common-thin-system/src/main/java/org/leocoder/thin/system/controller/picture/SysPictureController.java @@ -52,6 +52,7 @@ public class SysPictureController { Page page = new Page<>(vo.getPageNo(), vo.getPageSize()); // 条件构造器 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StringUtils.isNotBlank(vo.getPictureName()), SysPicture::getPictureName, vo.getPictureName()); wrapper.eq(StringUtils.isNotBlank(vo.getPictureSuffix()), SysPicture::getPictureSuffix, vo.getPictureSuffix()); wrapper.eq(StringUtils.isNotBlank(vo.getPictureService()), SysPicture::getPictureService, vo.getPictureService()); wrapper.eq(StringUtils.isNotBlank(vo.getPictureType()) && !CoderConstants.ZERO_STRING.equals(vo.getPictureType()), SysPicture::getPictureType, vo.getPictureType()); @@ -71,6 +72,7 @@ public class SysPictureController { public List list(SysPictureVo vo) { // 条件构造器 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StringUtils.isNotBlank(vo.getPictureName()), SysPicture::getPictureName, vo.getPictureName()); wrapper.eq(StringUtils.isNotBlank(vo.getPictureType()), SysPicture::getPictureType, vo.getPictureType()); wrapper.eq(StringUtils.isNotBlank(vo.getPictureSuffix()), SysPicture::getPictureSuffix, vo.getPictureSuffix()); wrapper.eq(StringUtils.isNotBlank(vo.getPictureService()), SysPicture::getPictureService, vo.getPictureService());