mirror of
https://github.com/cool-team-official/cool-admin-java.git
synced 2026-10-07 14:08:04 +08:00
1、controller join表排序问题修复
2、优化插件逻辑
This commit is contained in:
+5
-2
@@ -1,5 +1,7 @@
|
||||
package com.cool.modules.base.controller.admin.sys;
|
||||
|
||||
import static com.cool.modules.base.entity.sys.table.BaseSysParamEntityTableDef.BASE_SYS_PARAM_ENTITY;
|
||||
|
||||
import cn.hutool.json.JSONObject;
|
||||
import com.cool.core.annotation.CoolRestController;
|
||||
import com.cool.core.base.BaseController;
|
||||
@@ -7,9 +9,8 @@ import com.cool.modules.base.entity.sys.BaseSysParamEntity;
|
||||
import com.cool.modules.base.service.sys.BaseSysParamService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
||||
/**
|
||||
* 系统参数配置
|
||||
@@ -20,6 +21,8 @@ public class AdminBaseSysParamController extends BaseController<BaseSysParamServ
|
||||
|
||||
@Override
|
||||
protected void init(HttpServletRequest request, JSONObject requestParams) {
|
||||
setPageOption(createOp().fieldEq(BASE_SYS_PARAM_ENTITY.DATA_TYPE)
|
||||
.keyWordLikeFields(BASE_SYS_PARAM_ENTITY.NAME, BASE_SYS_PARAM_ENTITY.KEY_NAME));
|
||||
}
|
||||
|
||||
@Operation(summary = "根据键返回网页的参数值")
|
||||
|
||||
@@ -83,7 +83,7 @@ public class BaseSysUserServiceImpl extends BaseServiceImpl<BaseSysUserMapper, B
|
||||
!coolSecurityUtil.username().equals("admin")));
|
||||
|
||||
qw.groupBy(BASE_SYS_USER_ENTITY.ID);
|
||||
return mapper.paginateWithRelations(page, qw);
|
||||
return mapper.paginate(page, qw);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user