From 51c36e6f6b17862714fbd5c42da43386dc05d28a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 09 Apr 2021 14:32:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
index ce249a6..49a9833 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
@@ -1,28 +1,24 @@
package com.moral.api.service.impl;
-import java.util.ArrayList;
-import java.util.Date;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Group;
import com.moral.api.entity.GroupMenu;
-import com.moral.api.entity.User;
import com.moral.api.entity.UserGroup;
import com.moral.api.mapper.GroupMapper;
import com.moral.api.mapper.GroupMenuMapper;
import com.moral.api.mapper.UserGroupMapper;
-import com.moral.api.mapper.UserMapper;
import com.moral.api.service.GroupService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
-import com.moral.util.RegexUtils;
+import com.moral.util.ConvertUtils;
import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -110,6 +106,7 @@
queryWrapper.eq("organization_id", organizationId)
.eq("is_delete", Constants.NOT_DELETE);
Object order = parameters.get("order");
+ Object orderType = parameters.get("orderType");
Object groupName = parameters.get("groupName");
//������������������
if (groupName != null) {
@@ -128,10 +125,15 @@
int size = Integer.parseInt(parameters.get("size").toString());
Page<Group> pageData = new Page<>(page, size);
//������������,������id������
- if (order == null) {
- queryWrapper.orderByAsc("id");
+ //������������,������create_time������
+ if (order != null && orderType != null) {
+ if (Constants.ORDER_ASC.equals(orderType)) {
+ queryWrapper.orderByAsc(ConvertUtils.toLine(order.toString()));
+ } else {
+ queryWrapper.orderByDesc(ConvertUtils.toLine(order.toString()));
+ }
} else {
- queryWrapper.orderByAsc(order.toString(), "id");
+ queryWrapper.orderByDesc("create_time");
}
groupMapper.selectPage(pageData, queryWrapper);
return pageData;
--
Gitblit v1.8.0