diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsColumnController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsColumnController.java index c0e183ea..2b3e03dd 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsColumnController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsColumnController.java @@ -105,11 +105,12 @@ public class CmsColumnController extends JeecgController> result = new Result<>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(CmsColumn, req.getParameterMap()); + QueryWrapper queryWrapper = new QueryWrapper<>();// QueryGenerator.initQueryWrapper(CmsColumn, req.getParameterMap()); String name = CmsColumn.getName(); if (StringUtils.isBlank(name)) { queryWrapper.eq("pid", CmsColumn.getPid()); } + queryWrapper.orderBy(true, true, "sort"); Page page = new Page(pageNo, pageSize); IPage pageList = cmsColumnService.page(page, queryWrapper); result.setSuccess(true); @@ -189,9 +190,12 @@ public class CmsColumnController extends JeecgController> queryPageList(CmsColumn CmsColumn, HttpServletRequest req) { + public Result> queryPageList(CmsColumn cmsColumn, HttpServletRequest req) { Result> result = new Result(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(CmsColumn, req.getParameterMap()); +// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(CmsColumn, req.getParameterMap()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("pid", cmsColumn.getPid()); + queryWrapper.orderBy(true, true, "sort"); List list = cmsColumnService.list(queryWrapper); result.setSuccess(true); result.setResult(list); @@ -213,6 +217,7 @@ public class CmsColumnController extends JeecgController queryWrapper = new QueryWrapper<>(); List parentIdList = Arrays.asList(parentIds.split(",")); queryWrapper.in("pid", parentIdList); + queryWrapper.orderBy(true, true, "sort"); List list = cmsColumnService.list(queryWrapper); IPage pageList = new Page<>(1, 10, list.size()); pageList.setRecords(list); diff --git a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 3b8786a6..42258cbf 100644 --- a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -160,7 +160,7 @@ mybatis-plus: table-underline: true configuration: # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用 - #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 call-setters-on-nulls: true #jeecg专用配置 diff --git a/jeecgboot-vue3-master/src/views/cms/admin/column/CmsColumn.data.ts b/jeecgboot-vue3-master/src/views/cms/admin/column/CmsColumn.data.ts index 64ebedeb..bcb02741 100644 --- a/jeecgboot-vue3-master/src/views/cms/admin/column/CmsColumn.data.ts +++ b/jeecgboot-vue3-master/src/views/cms/admin/column/CmsColumn.data.ts @@ -72,11 +72,11 @@ export const formSchema: FormSchema[] = [ componentProps: { //options里面由一个一个的radio组成,支持disabled options: [ - { label: '是', value: 1 }, - { label: '否', value: 0 }, + { label: '是', value: '1' }, + { label: '否', value: '0' }, ], }, - defaultValue: 1, + defaultValue: '1', }, { label: '排序', diff --git a/jeecgboot-vue3-master/src/views/cms/admin/column/CmsColumnList.vue b/jeecgboot-vue3-master/src/views/cms/admin/column/CmsColumnList.vue index 6013f3c7..2240be9f 100644 --- a/jeecgboot-vue3-master/src/views/cms/admin/column/CmsColumnList.vue +++ b/jeecgboot-vue3-master/src/views/cms/admin/column/CmsColumnList.vue @@ -10,8 +10,8 @@ >