From 2ea0de84776826ce0a7b37db0bbbc718284c6127 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期一, 02 九月 2024 09:31:46 +0800
Subject: [PATCH] 会议室功能优化9.2
---
src/main/java/com/product/administration/service/GoOutApplicationService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/product/administration/service/GoOutApplicationService.java b/src/main/java/com/product/administration/service/GoOutApplicationService.java
index 3e85277..4e6ed20 100644
--- a/src/main/java/com/product/administration/service/GoOutApplicationService.java
+++ b/src/main/java/com/product/administration/service/GoOutApplicationService.java
@@ -48,11 +48,11 @@
if(!StringUtils.isEmpty(dataFilter)){
filter += " and "+dataFilter;
}
- DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_GO_OUT_APPLICATON,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_GO_OUT_APPLICATON,filter,null,null,"created_utc_datetime desc",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
-
+
/**
* 澶栧嚭鐢宠璇︽儏
* @param fs
@@ -62,7 +62,7 @@
public FieldSetEntity findGoOutApplication(FieldSetEntity fs) throws BaseException {
return baseDao.listInternationDataTable(baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_GO_OUT_APPLICATON, fs.getString(CmnConst.UUID), true),null);
}
-
+
/**
* 澶栧嚭鐢宠淇濆瓨
* @param fs
@@ -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);
@@ -85,8 +85,8 @@
return fs.getString(CmnConst.UUID);
}
}
-
-
+
+
/**
* 澶栧嚭鐢宠鍒犻櫎
* @param fs
--
Gitblit v1.9.2