From 46f79b491173d284a4900d19e7aecf7509481438 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 一月 2022 17:21:25 +0800
Subject: [PATCH] 2022-01-21

---
 src/utils/utils-datamanage.js |   52 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 2ef1ab7..4b98d65 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -146,18 +146,23 @@
 
     let _search = ''
     
-    if (setting.queryType === 'statistics' && _dataresource) { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
-      regoptions.forEach(item => {
-        _dataresource = _dataresource.replace(item.reg, item.value)
-      })
-    } else if (_dataresource && !id) {
-      _search = Utils.joinMainSearchkey(search)
-      if (_search) {
-        _search = 'where ' + _search
+    if (_dataresource) {
+      if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+        regoptions.forEach(item => {
+          _dataresource = _dataresource.replace(item.reg, item.value)
+        })
+        if (id) {
+          _dataresource = _dataresource + ` where ${setting.primaryKey || 'ID'}='${id}'`
+        }
+      } else if (!id) {
+        _search = Utils.joinMainSearchkey(search)
+        if (_search) {
+          _search = 'where ' + _search
+        }
+      } else if (id) {
+        _search = Utils.joinMainSearchkey(search)
+        _search = `where ${_search ? _search + ' AND ' : ''} ${setting.primaryKey || 'ID'}='${id}'`
       }
-    } else if (_dataresource && id) {
-      _search = Utils.joinMainSearchkey(search)
-      _search = `where ${_search ? _search + ' AND ' : ''} ${setting.primaryKey || 'ID'}='${id}'`
     }
 
     if (_customScript) {
@@ -196,8 +201,8 @@
 
     // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
     if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
-      _customScript &&  console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
-      LText &&  console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText)
+      _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+      LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText)
     }
 
     if (setting.$name) {
@@ -207,6 +212,25 @@
     param.custom_script = Utils.formatOptions(_customScript)
     param.LText = Utils.formatOptions(LText)
     param.DateCount = Utils.formatOptions(DateCount)
+
+    // 澶氬眰缁撴瀯鏁版嵁
+    // LText = `SELECT a.id as bid,a.ID,a.workerCode,a.workerName,a.jobName,a.Initials,case when isnull(m.friend_id ,'') ='' then '' 
+    // when isnull(m.status,0)=10 then '宸叉坊鍔�' else '寰呴�氳繃' end as friend_text
+    // ,case when images='' then  'http://epc.mk9h.cn/Content/images/upload/img/kane.jpg'  else images end as icon FROM  
+    // (select friend_id,status from oa_mail_list where userid='sso202004100959326131C0805998B6745F886F9' and  Initials=case when right('0',1)='0' then Initials else '0'  end 
+    // and status=10  and deleted=0) m 
+    //  inner join  (select * from BD_workers where 
+    //  Initials=case when right('0',1)='0' then Initials else '0' end and deleted=0 ) a
+    //  on a.id=m.friend_id `
+    // param.custom_script = ''
+    // param.LText = Utils.formatOptions(LText)
+    // param.DateCount = ''
+    // param.prm_field = 'workerCode'
+    // param.arr_field = 'workerName,jobName'
+    // param.tabid = 'ID'
+    // param.parid = 'BID'
+    // param.sub_name = 'sub_data'
+    // param.sub_field = 'BID,friend_text,icon,Initials'
 
     // exec_type: 'y' 瑙g爜瀛楁锛歀Text銆丩Text1銆丩Text2銆乧ustom_script銆丏ateCount
 
@@ -672,7 +696,7 @@
 
   // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
   if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
-    _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�/\n` : ''}${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+    _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�*/\n` : ''}${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
     _dataresource && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧愶紙鍚屾鏌ヨ锛�*/\n` : ''}` + _dataresource)
   }
 

--
Gitblit v1.8.0