SkyID
/
zheng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复表格排序bug

This commit is contained in:
shuzheng 2017-10-21 17:36:44 +08:00
parent 9a97608c11
commit 17da803b43
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsSettingController.java
View File

@ -9,6 +9,7 @@ import com.zheng.cms.dao.model.CmsSetting;
import com.zheng.cms.dao.model.CmsSettingExample;
import com.zheng.cms.rpc.api.CmsSettingService;
import com.zheng.common.base.BaseController;
import com.zheng.common.util.StringUtil;
import com.zheng.common.validator.LengthValidator;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -57,7 +58,7 @@ public class CmsSettingController extends BaseController {
@RequestParam(required = false, value = "order") String order) {
CmsSettingExample cmsSettingExample = new CmsSettingExample();
if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
cmsSettingExample.setOrderByClause(sort + " " + order);
cmsSettingExample.setOrderByClause(StringUtil.humpToLine(sort) + " " + order);
}
List<CmsSetting> rows = cmsSettingService.selectByExampleForOffsetPage(cmsSettingExample, offset, limit);
long total = cmsSettingService.countByExample(cmsSettingExample);

7
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsPermissionController.java
View File

@ -1,7 +1,5 @@
package com.zheng.upms.server.controller.manage;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baidu.unbiz.fluentvalidator.ComplexResult;
import com.baidu.unbiz.fluentvalidator.FluentValidator;
import com.baidu.unbiz.fluentvalidator.ResultCollectors;
@ -9,7 +7,10 @@ import com.zheng.common.base.BaseController;
import com.zheng.common.validator.LengthValidator;
import com.zheng.upms.common.constant.UpmsResult;
import com.zheng.upms.common.constant.UpmsResultConstant;
import com.zheng.upms.dao.model.*;
import com.zheng.upms.dao.model.UpmsPermission;
import com.zheng.upms.dao.model.UpmsPermissionExample;
import com.zheng.upms.dao.model.UpmsSystem;
import com.zheng.upms.dao.model.UpmsSystemExample;
import com.zheng.upms.rpc.api.UpmsApiService;
import com.zheng.upms.rpc.api.UpmsPermissionService;
import com.zheng.upms.rpc.api.UpmsSystemService;