diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/controller/DictController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/controller/DictController.java index c9a2cf2..7541b35 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/controller/DictController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/controller/DictController.java @@ -71,8 +71,9 @@ public class DictController { * 获取字典数据 */ @GetMapping("/dict_data") - public R> obtainDictData(@RequestParam String dictKey) { - return R.success(dictService.obtainDictData(dictKey)); + public R> obtainDictData(@RequestParam("dictKey") String dictKey, + @RequestParam(value = "txt", required = false) String txt) { + return R.success(dictService.obtainDictData(dictKey, txt)); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/service/DictService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/service/DictService.java index 59d6246..0f2ed49 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/service/DictService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/service/DictService.java @@ -67,13 +67,25 @@ public class DictService extends ServiceImpl implements * 分页查询 */ public PageResult paging(PageParam pageParam, DictEntity dictEntity) { + String dictName = dictEntity.getDictName(); return PageResult.of(this.page(pageParam.toPage(), Wrappers.lambdaQuery() - .like(StrUtil.isNotBlank(dictEntity.getDictName()), DictEntity::getDictName, dictEntity.getDictName()))); + .and(StrUtil.isNotBlank(dictName), it -> + it.like(DictEntity::getDictKey, dictName) + .or().like(DictEntity::getDictName, dictName) + .or().like(DictEntity::getMemo, dictName) + ) + )); } - - public List obtainDictData(String dictKey) { - return dictItemService.list(Wrappers.lambdaQuery().eq(DictItemEntity::getDictKey, dictKey)) + public List obtainDictData(String dictKey, String keywords) { + return dictItemService.list(Wrappers.lambdaQuery().eq(DictItemEntity::getDictKey, dictKey) + .and(StrUtil.isNotBlank(keywords), it -> + it.like(DictItemEntity::getTxt, keywords) + .or().like(DictItemEntity::getVal, keywords) + .or().like(DictItemEntity::getMemo, keywords) + ) + .orderByAsc(DictItemEntity::getSort, DictItemEntity::getVal) + ) .stream().map(it -> BeanUtil.copyProperties(it, ObtainDictDataResult.class)) .collect(Collectors.toList()); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/result/MenuDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/result/MenuDetailResult.java index 956fb6e..5c0f743 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/result/MenuDetailResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/result/MenuDetailResult.java @@ -21,7 +21,7 @@ public class MenuDetailResult { * 主键 Id */ private Long id; - + private String sn; /** * 上级 Id; 层级为 1 的节点值为 0 */ diff --git a/z-doc/pdma/njzscloud-dispose.pdma b/z-doc/pdma/njzscloud-dispose.pdma index 70330f6..4d36a7d 100644 --- a/z-doc/pdma/njzscloud-dispose.pdma +++ b/z-doc/pdma/njzscloud-dispose.pdma @@ -613,7 +613,7 @@ "genItems": [ { "itemKey": "page.vue", - "itemTemplate": "{{\r\nlet first_ =it.defKey.indexOf('_');\r\nlet moduleName = it.defKey.slice(0,first_);\r\nlet pageName = it.defKey.slice(first_ +1,first_ +2).toUpperCase() + it.defKey.slice(first_ +2);\r\nlet pageName_ = it.defKey.slice(first_ +1);\r\nlet fields = it.fields.filter(it=>it.defKey!=='id' && it.defKey!=='creator_id' && it.defKey!=='modifier_id' && it.defKey!=='create_time' && it.defKey!=='modify_time' && it.defKey!=='deleted');\r\n}}\r\n\r\n\r\n\r\n\r\n$blankline" + "itemTemplate": "{{\r\nlet first_ =it.defKey.indexOf('_');\r\nlet moduleName = it.defKey.slice(0,first_);\r\nlet pageName = it.defKey.slice(first_ +1,first_ +2).toUpperCase() + it.defKey.slice(first_ +2);\r\nlet pageName_ = it.defKey.slice(first_ +1);\r\nlet fields = it.fields.filter(it=>it.defKey!=='id' && it.defKey!=='creator_id' && it.defKey!=='modifier_id' && it.defKey!=='create_time' && it.defKey!=='modify_time' && it.defKey!=='deleted');\r\n}}\r\n\r\n\r\n\r\n\r\n$blankline" }, { "itemKey": "page.ts", @@ -7987,7 +7987,7 @@ "primaryKey": 0, "notNull": 1, "autoIncrement": 0, - "defaultValue": "", + "defaultValue": "''", "stndDictId": "", "stndDictKey": "", "stndFieldId": "", @@ -8076,7 +8076,8 @@ ] } ], - "refers": [] + "refers": [], + "props": "{\"codegen\":{\"NodeJS_Ts\":{\"root\":\"D:\\\\DaiMa\\\\WebStorm\\\\njzscloud-dispose-web\\\\src\\\\pages\",\"nameSpace\":\"sys\",\"baseName\":\"dict\",\"path\":{\"page.vue\":{\"value\":\"{{=it.genCode.nameSpace}}/{{=it.genCode.baseName}}/{{=it.func.camel(it.genCode.baseName,true)}}.vue\",\"enable\":1},\"page.ts\":{\"enable\":1,\"value\":\"{{=it.genCode.nameSpace}}/{{=it.genCode.baseName}}/page.ts\"},\"form.vue\":{\"value\":\"{{=it.genCode.nameSpace}}/{{=it.genCode.baseName}}/{{=it.func.camel(it.genCode.baseName,true)}}Form.vue\",\"enable\":1},\"api.ts\":{\"value\":\"{{=it.genCode.nameSpace}}/{{=it.genCode.baseName}}/{{=it.genCode.baseName}}-api.ts\",\"enable\":1},\"d.ts\":{\"value\":\"{{=it.genCode.nameSpace}}/{{=it.genCode.baseName}}/{{=it.genCode.baseName}}.d.ts\",\"enable\":1}},\"var\":{}}}}" }, { "id": "457D3BF0-A5A6-4636-A83E-3903ACD2C4A2", @@ -8741,7 +8742,7 @@ "primaryKey": 0, "notNull": 1, "autoIncrement": 0, - "defaultValue": "", + "defaultValue": "''", "stndDictId": "", "stndDictKey": "", "stndFieldId": "", @@ -8836,7 +8837,8 @@ ] } ], - "refers": [] + "refers": [], + "props": "{\"codegen\":{\"NodeJS_Ts\":{\"root\":\"D:\\\\DaiMa\\\\WebStorm\\\\njzscloud-dispose-web\\\\src\\\\pages\",\"nameSpace\":\"sys\",\"baseName\":\"dict-item\",\"path\":{\"page.vue\":{\"value\":\"{{=it.genCode.nameSpace}}/{{=it.genCode.baseName}}/{{=it.func.camel(it.genCode.baseName,true)}}.vue\",\"enable\":1},\"page.ts\":{\"enable\":1,\"value\":\"{{=it.genCode.nameSpace}}/{{=it.genCode.baseName}}/page.ts\"},\"form.vue\":{\"value\":\"{{=it.genCode.nameSpace}}/{{=it.genCode.baseName}}/{{=it.func.camel(it.genCode.baseName,true)}}Form.vue\",\"enable\":1},\"api.ts\":{\"value\":\"{{=it.genCode.nameSpace}}/{{=it.genCode.baseName}}/{{=it.genCode.baseName}}-api.ts\",\"enable\":1},\"d.ts\":{\"value\":\"{{=it.genCode.nameSpace}}/{{=it.genCode.baseName}}/{{=it.genCode.baseName}}.d.ts\",\"enable\":1}},\"var\":{}}}}" }, { "id": "9B28F97D-A220-48BA-B256-99952BD84550", @@ -14850,7 +14852,7 @@ "readonly": false, "allowWs": false }, - "updateTime": 1764745416916, - "signature": "8544bca36f09b1a9aaacb5609a28e4cb", + "updateTime": 1764836088996, + "signature": "871d009d0ea586be551b1cb6a87f0fb2", "branchId": "1111" } \ No newline at end of file