From 5e1d4d5155c57c43739d61914e2d29a64f9bb683 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 17:40:38 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils-datamanage.js | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index be72648..a5cb08d 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -54,6 +54,11 @@
if (setting.interType === 'inner') {
param.func = setting.innerFunc
+
+ if (setting.recordUser === 'true') {
+ param.username = sessionStorage.getItem('User_Name') || ''
+ param.fullname = sessionStorage.getItem('Full_Name') || ''
+ }
} else {
if (window.GLOB.mkHS) {
if (setting.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
@@ -201,16 +206,14 @@
let arr_field = setting.all_field || setting.arr_field
if (_dataresource) {
- if (setting.laypage && orderBy) {
- if (setting.custompage) {
- LText = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search} `
+ if (setting.custompage) {
+ LText = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search} `
+ } else if (setting.laypage && orderBy) {
+ LText = `/*system_query*/select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows `
+ if (setting.sub_field) {
+ DateCount = `/*system_query*/select count(1) as total from (select distinct ${setting.primaryKey} from ${_dataresource} ${_search})a`
} else {
- LText = `/*system_query*/select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows `
- if (setting.sub_field) {
- DateCount = `/*system_query*/select count(1) as total from (select distinct ${setting.primaryKey} from ${_dataresource} ${_search})a`
- } else {
- DateCount = `/*system_query*/select count(1) as total from ${_dataresource} ${_search}`
- }
+ DateCount = `/*system_query*/select count(1) as total from ${_dataresource} ${_search}`
}
} else if (orderBy) {
LText = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
--
Gitblit v1.8.0