From 84169fc928d887d606e12380cfa3c1409d04db2a Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 22 八月 2023 14:44:01 +0800
Subject: [PATCH] 协同办公列表排序
---
src/main/java/com/product/administration/service/GoOutApplicationService.java | 2 +-
src/main/java/com/product/administration/service/CooperatesService.java | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/product/administration/service/CooperatesService.java b/src/main/java/com/product/administration/service/CooperatesService.java
index 26eea79..b1d3f2b 100644
--- a/src/main/java/com/product/administration/service/CooperatesService.java
+++ b/src/main/java/com/product/administration/service/CooperatesService.java
@@ -1,6 +1,5 @@
package com.product.administration.service;
-import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONArray;
import com.product.admin.service.UserService;
import com.product.administration.config.CmnConst;
@@ -9,7 +8,6 @@
import com.product.core.config.CoreConst;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
-import com.product.core.entity.FieldMetaEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import com.product.core.permission.PermissionService;
@@ -321,7 +319,7 @@
if (!StringUtils.isEmpty(queryFilter)) {
str.append(" and ").append(queryFilter);
}
- str.append(" ) a");
+ str.append(" order by start_time desc) a");
DataTableEntity dt = baseDao.listTable(str.toString(), new Object[]{user_id, 2}, fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
dt.getMeta().addAliasTable("product_oa_cooperates", "lc");
dt.getMeta().addAliasTable("product_oa_cooperate_flow_node", "lcn");
diff --git a/src/main/java/com/product/administration/service/GoOutApplicationService.java b/src/main/java/com/product/administration/service/GoOutApplicationService.java
index dc7db39..4e6ed20 100644
--- a/src/main/java/com/product/administration/service/GoOutApplicationService.java
+++ b/src/main/java/com/product/administration/service/GoOutApplicationService.java
@@ -74,7 +74,7 @@
if(StringUtils.isEmpty(fs.getString(CmnConst.UUID))){
fs.setValue(CmnConst.ORG_LEVEL_UUID, SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());//鍏徃
fs.setValue("applicant", SpringMVCContextHolder.getCurrentUser().getUser_id());//鐢宠浜哄憳
- fs.setValue(CmnConst.DEPT_UUID, SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());//鐢宠閮ㄩ棬
+ fs.setValue(CmnConst.DEPT_UUID, SpringMVCContextHolder.getCurrentUser().getDept_uuid());//鐢宠閮ㄩ棬
fs.setValue(CmnConst.CREATED_BY,SpringMVCContextHolder.getCurrentUser().getUser_id());
fs.setValue(CmnConst.CREATED_UTC_DATETIME,new Date());
return baseDao.add(fs);
--
Gitblit v1.9.2