diff --git a/src/application/core-dict/core-dict.service.ts b/src/application/core-dict/core-dict.service.ts index e63971a..aaa4687 100644 --- a/src/application/core-dict/core-dict.service.ts +++ b/src/application/core-dict/core-dict.service.ts @@ -14,6 +14,7 @@ import { alias, QueryBuilder } from 'drizzle-orm/mysql-core'; import { GuardInfo } from '@utils/myType'; import { isTrueEnum, isExistKey } from '@utils/boolean.enum'; import { customDrizzleRowWithRecursive } from '@utils/customDrizzleRowWithRecursive'; +import { Case } from 'change-case-all'; @Injectable() export class CoreDictService { @@ -137,7 +138,9 @@ export class CoreDictService { * DATE: 2024-06-04 19:21:40 - * */ public async findTargetList(dictKey: string, pacCoreDictTargetListDto: PacCoreDictTargetListDto) { - const [result] = await this.getTargetDictList(dictKey, pacCoreDictTargetListDto); + const DictKey = Case.constant(dictKey); + console.log(DictKey); + const [result] = await this.getTargetDictList(DictKey, pacCoreDictTargetListDto); return result; } diff --git a/src/application/core-menu/core-menu.service.ts b/src/application/core-menu/core-menu.service.ts index 693829d..3fb7da2 100644 --- a/src/application/core-menu/core-menu.service.ts +++ b/src/application/core-menu/core-menu.service.ts @@ -162,8 +162,8 @@ export class CoreMenuService { menuType: createCoreMenuDto.menuType, menuIcon: createCoreMenuDto.menuIcon, isFrame: isTrueEnum(createCoreMenuDto.isFrame) ? 1 : 0, - isVisible: isTrueEnum(createCoreMenuDto.isVisible) ? 0 : 1, - isActivate: isTrueEnum(createCoreMenuDto.isActivate) ? 0 : 1, + isVisible: isTrueEnum(createCoreMenuDto.isVisible) ? 1 : 0, + isActivate: isTrueEnum(createCoreMenuDto.isActivate) ? 1 : 0, orderNum: createCoreMenuDto.orderNum, serviceKey: createCoreMenuDto.serviceKey, createby: guardInfo.userId, @@ -222,7 +222,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) ? 0 : 1).if(isExistKey(data, 'isVisible'))); + wl.push(eq(pacCoreMenu.isVisible, isTrueEnum(data.isVisible) ? 1 : 0).if(isExistKey(data, 'isVisible'))); // ? 根据状态查 wl.push(eq(pacCoreMenu.status, data.status as any).if(isExistKey(data, 'status'))); @@ -231,11 +231,11 @@ export class CoreMenuService { if (this.config.get('masterId') === guardInfo.userId) { // ? 是否要按照激活查 if (isExistKey(data, 'isActivate')) { - wl.push(eq(pacCoreMenu.isActivate, isTrueEnum(data['isActivate']) ? 0 : 1)); + wl.push(eq(pacCoreMenu.isActivate, isTrueEnum(data['isActivate']) ? 1 : 0)); } } else { // 非pac只能查激活的 - wl.push(eq(pacCoreMenu.isActivate, 0)); + wl.push(eq(pacCoreMenu.isActivate, 1)); } query.where(and(...wl)); @@ -307,8 +307,8 @@ export class CoreMenuService { menuType: updateCoreMenuDto.menuType, menuIcon: updateCoreMenuDto.menuIcon, isFrame: isTrueEnum(updateCoreMenuDto.isFrame) ? 1 : 0, - isVisible: isTrueEnum(updateCoreMenuDto.isVisible) ? 0 : 1, - isActivate: isTrueEnum(updateCoreMenuDto.isActivate) ? 0 : 1, + isVisible: isTrueEnum(updateCoreMenuDto.isVisible) ? 1 : 0, + isActivate: isTrueEnum(updateCoreMenuDto.isActivate) ? 1 : 0, orderNum: updateCoreMenuDto.orderNum, status: updateCoreMenuDto.status, serviceKey: updateCoreMenuDto.serviceKey,