12.2
This commit is contained in:
@@ -300,7 +300,7 @@ public class SysMenuRest {
|
|||||||
public ResultBean update(@Valid @RequestBody SysMenuDto dto, @PathVariable("sid") String sid){
|
public ResultBean update(@Valid @RequestBody SysMenuDto dto, @PathVariable("sid") String sid){
|
||||||
ResultBean rb = ResultBean.fireFail();
|
ResultBean rb = ResultBean.fireFail();
|
||||||
//查询菜单是否存在
|
//查询菜单是否存在
|
||||||
SysMenu sysMenu = sysMenuService.fetchBySid(sid);
|
SysMenu sysMenu = sysMenuService.fetchBySid1(sid);
|
||||||
if (sysMenu == null) {
|
if (sysMenu == null) {
|
||||||
return rb.setMsg("菜单不存在");
|
return rb.setMsg("菜单不存在");
|
||||||
}
|
}
|
||||||
@@ -322,7 +322,7 @@ public class SysMenuRest {
|
|||||||
@PostMapping("/updateIsEnable/{sid}/{isEnable}")
|
@PostMapping("/updateIsEnable/{sid}/{isEnable}")
|
||||||
public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") Integer isEnable) {
|
public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") Integer isEnable) {
|
||||||
ResultBean rb = ResultBean.fireFail();
|
ResultBean rb = ResultBean.fireFail();
|
||||||
SysMenu sysMenu = sysMenuService.fetchBySid(sid);
|
SysMenu sysMenu = sysMenuService.fetchBySid1(sid);
|
||||||
if (sysMenu == null) {
|
if (sysMenu == null) {
|
||||||
//查询资源是否存在
|
//查询资源是否存在
|
||||||
SysSource sysSource = sysSourceService.fetchBySid(sid);
|
SysSource sysSource = sysSourceService.fetchBySid(sid);
|
||||||
@@ -368,7 +368,7 @@ public class SysMenuRest {
|
|||||||
@GetMapping("/delBySids/{sid}")
|
@GetMapping("/delBySids/{sid}")
|
||||||
public ResultBean delBySids(@PathVariable("sid") String sid) {
|
public ResultBean delBySids(@PathVariable("sid") String sid) {
|
||||||
ResultBean rb = ResultBean.fireFail();
|
ResultBean rb = ResultBean.fireFail();
|
||||||
SysMenu sysMenu = sysMenuService.fetchBySid(sid);
|
SysMenu sysMenu = sysMenuService.fetchBySid1(sid);
|
||||||
sysMenu.setIsDelete(1);
|
sysMenu.setIsDelete(1);
|
||||||
sysMenuService.update(sysMenu,new QueryWrapper<SysMenu>().eq("sid",sid));
|
sysMenuService.update(sysMenu,new QueryWrapper<SysMenu>().eq("sid",sid));
|
||||||
return rb.success();
|
return rb.success();
|
||||||
|
|||||||
@@ -41,9 +41,11 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
|
|||||||
List<SysMenuVo> listAllParentByRoleSidG(String roleSid, String sid, @Param("sourceSid") String sourceSid,@Param("orgSid") String orgSid);
|
List<SysMenuVo> listAllParentByRoleSidG(String roleSid, String sid, @Param("sourceSid") String sourceSid,@Param("orgSid") String orgSid);
|
||||||
|
|
||||||
@Select("SELECT menu.*,sourceMenu.`sourceSid` FROM sys_menu menu " +
|
@Select("SELECT menu.*,sourceMenu.`sourceSid` FROM sys_menu menu " +
|
||||||
"LEFT JOIN sys_org_authorize sourceMenu ON menu.sid=sourceMenu.menuSid where menu.sid=#{sid}")
|
"LEFT JOIN sys_authorize_group_detail sourceMenu ON menu.sid = sourceMenu.menuSid where menu.sid=#{sid}")
|
||||||
SysMenu fetchBySid(@Param("sid") String sid);
|
SysMenu fetchBySid(@Param("sid") String sid);
|
||||||
|
@Select("SELECT menu.* FROM sys_menu menu " +
|
||||||
|
"where menu.sid=#{sid}")
|
||||||
|
SysMenu fetchBySid1(@Param("sid") String sid);
|
||||||
List<SysMenuTreeVo> getChildrensForMenuTree(@Param(Constants.WRAPPER) QueryWrapper<SysMenuTreeVo> qw);
|
List<SysMenuTreeVo> getChildrensForMenuTree(@Param(Constants.WRAPPER) QueryWrapper<SysMenuTreeVo> qw);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -62,11 +62,14 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public SysMenu fetchBySid(String sid) {
|
public SysMenu fetchBySid(String sid) {
|
||||||
return baseMapper.fetchBySid(sid);
|
return baseMapper.fetchBySid(sid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public SysMenu fetchBySid1(String sid) {
|
||||||
|
return baseMapper.fetchBySid1(sid);
|
||||||
|
}
|
||||||
public List<SysMenu> listAll(SysMenuQuery query) {
|
public List<SysMenu> listAll(SysMenuQuery query) {
|
||||||
QueryWrapper<SysMenu> qw = createQueryWrapper(query);
|
QueryWrapper<SysMenu> qw = createQueryWrapper(query);
|
||||||
return baseMapper.selectList(qw);
|
return baseMapper.selectList(qw);
|
||||||
|
|||||||
Reference in New Issue
Block a user