|
|
|
@ -115,12 +115,7 @@ export class CoreMenuService { |
|
|
|
|
throw new HttpException('没有权限删除菜单!', HttpStatus.UNAUTHORIZED); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (id == updateCoreMenuDto.pid) { |
|
|
|
|
throw new HttpException('数据成环,无法设置!', HttpStatus.BAD_REQUEST); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// ! 写入数据
|
|
|
|
|
return this.updateMenuData(id, updateCoreMenuDto, guardInfo); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public async remove(id: string, guardInfo: GuardInfo) { |
|
|
|
@ -162,8 +157,8 @@ export class CoreMenuService { |
|
|
|
|
menuType: createCoreMenuDto.menuType, |
|
|
|
|
menuIcon: createCoreMenuDto.menuIcon, |
|
|
|
|
isFrame: isTrueEnum(createCoreMenuDto.isFrame) ? 1 : 0, |
|
|
|
|
isVisible: isTrueEnum(createCoreMenuDto.isVisible) ? 1 : 0, |
|
|
|
|
isActivate: isTrueEnum(createCoreMenuDto.isActivate) ? 1 : 0, |
|
|
|
|
isVisible: isTrueEnum(createCoreMenuDto.isVisible) ? 0 : 1, |
|
|
|
|
isActivate: isTrueEnum(createCoreMenuDto.isActivate) ? 0 : 1, |
|
|
|
|
orderNum: createCoreMenuDto.orderNum, |
|
|
|
|
serviceKey: createCoreMenuDto.serviceKey, |
|
|
|
|
createby: guardInfo.userId, |
|
|
|
@ -222,7 +217,7 @@ export class CoreMenuService { |
|
|
|
|
wl.push(eq(pacCoreMenu.isFrame, isTrueEnum(data.isFrame) ? 1 : 0).if(isExistKey(data, 'isFrame'))); |
|
|
|
|
|
|
|
|
|
// ? 根据是否显示查
|
|
|
|
|
wl.push(eq(pacCoreMenu.isVisible, isTrueEnum(data.isVisible) ? 1 : 0).if(isExistKey(data, 'isVisible'))); |
|
|
|
|
wl.push(eq(pacCoreMenu.isVisible, isTrueEnum(data.isVisible) ? 0 : 1).if(isExistKey(data, 'isVisible'))); |
|
|
|
|
|
|
|
|
|
// ? 根据状态查
|
|
|
|
|
wl.push(eq(pacCoreMenu.status, data.status as any).if(isExistKey(data, 'status'))); |
|
|
|
@ -231,11 +226,11 @@ export class CoreMenuService { |
|
|
|
|
if (this.config.get<number>('masterId') === guardInfo.userId) { |
|
|
|
|
// ? 是否要按照激活查
|
|
|
|
|
if (isExistKey(data, 'isActivate')) { |
|
|
|
|
wl.push(eq(pacCoreMenu.isActivate, isTrueEnum(data['isActivate']) ? 1 : 0)); |
|
|
|
|
wl.push(eq(pacCoreMenu.isActivate, isTrueEnum(data['isActivate']) ? 0 : 1)); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
// 非pac只能查激活的
|
|
|
|
|
wl.push(eq(pacCoreMenu.isActivate, 1)); |
|
|
|
|
wl.push(eq(pacCoreMenu.isActivate, 0)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
query.where(and(...wl)); |
|
|
|
@ -307,8 +302,8 @@ export class CoreMenuService { |
|
|
|
|
menuType: updateCoreMenuDto.menuType, |
|
|
|
|
menuIcon: updateCoreMenuDto.menuIcon, |
|
|
|
|
isFrame: isTrueEnum(updateCoreMenuDto.isFrame) ? 1 : 0, |
|
|
|
|
isVisible: isTrueEnum(updateCoreMenuDto.isVisible) ? 1 : 0, |
|
|
|
|
isActivate: isTrueEnum(updateCoreMenuDto.isActivate) ? 1 : 0, |
|
|
|
|
isVisible: isTrueEnum(updateCoreMenuDto.isVisible) ? 0 : 1, |
|
|
|
|
isActivate: isTrueEnum(updateCoreMenuDto.isActivate) ? 0 : 1, |
|
|
|
|
orderNum: updateCoreMenuDto.orderNum, |
|
|
|
|
status: updateCoreMenuDto.status, |
|
|
|
|
serviceKey: updateCoreMenuDto.serviceKey, |
|
|
|
|