From bbe4b315cf60e2a49e735a3ca74319b9be6f48f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 8 Dec 2023 11:43:19 +0800
Subject: [PATCH] =?UTF-8?q?pg=E8=84=9A=E6=9C=AC=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/sqlupgrade/PG/sql202303130202.sql |  4 ++--
 resource/sqlupgrade/PG/sql202307200603.sql | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/resource/sqlupgrade/PG/sql202303130202.sql b/resource/sqlupgrade/PG/sql202303130202.sql
index 54a9eae70..c6ed8b220 100644
--- a/resource/sqlupgrade/PG/sql202303130202.sql
+++ b/resource/sqlupgrade/PG/sql202303130202.sql
@@ -2,9 +2,9 @@ Delete from LeftMenuInfo where id=100186;
 /
 Delete from LeftMenuConfig where infoid=100186;
 /
-call LMConfig_U_ByInfoInsert (2,100118,9);
+select LMConfig_U_ByInfoInsert (2,100118,9);
 /
-call LMInfo_Insert (100186,541290,'','',2,100118,9,18);
+select LMInfo_Insert (100186,541290,'','',2,100118,9,18);
 /
 update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/externalPersonManage' where id = 100186;
 /
\ No newline at end of file
diff --git a/resource/sqlupgrade/PG/sql202307200603.sql b/resource/sqlupgrade/PG/sql202307200603.sql
index e211c560e..522bcacec 100644
--- a/resource/sqlupgrade/PG/sql202307200603.sql
+++ b/resource/sqlupgrade/PG/sql202307200603.sql
@@ -1,17 +1,14 @@
-select @current_date:= date_format( now(),'%Y-%m-%d');
-select @current_time:= date_format( now(),'%T');
-INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA,SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL,BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER,WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME,onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl,isPhyPage, subcompanyid, unconditionalQuery) VALUES ('salaryExtEmp', '1', '1', '', 'SELECT * FROM hrsa_external_employee where delete_type=0', '', '', '', '', '1','id', '', '', '', '', '', '', 2, '薪酬非系统人员', NULL, '', NULL, NULL, NULL, NULL, '', '', @current_date,@current_time, NULL, NULL, '', '', '0', uuid(), '', '', '', '', '1', 0, 1);
+INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA,SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL,BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER,WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME,onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl,isPhyPage, subcompanyid, unconditionalQuery) VALUES ('salaryExtEmp', '1', '1', '', 'SELECT * FROM hrsa_external_employee where delete_type=0', '', '', '', '', '1','id', '', '', '', '', '', '', 2, '薪酬非系统人员', NULL, '', NULL, NULL, NULL, NULL, '', '', '2020-01-01', '19:12:12', NULL, NULL, '', '', '0', uuid(), '', '', '', '', '1', 0, 1);
 
-select @datashowset_id:= max(id)from datashowset;
 
 INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime)
-VALUES ('salaryExtEmp', '0', 0, @current_date, @current_time, NULL, NULL);
+VALUES ('salaryExtEmp', '0', 0, '2020-01-01', '19:12:12', NULL, NULL);
 
 INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width)
-VALUES (@datashowset_id, '姓名', 'username', '', 1, 1, uuid(), NULL);
+VALUES ((select max(id) from datashowparam), '姓名', 'username', '', 1, 1, uuid(), NULL);
 INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width)
-VALUES (@datashowset_id, '手机号', 'mobile', '', 0, 2, uuid(), NULL);
+VALUES ((select max(id) from datashowparam), '手机号', 'mobile', '', 0, 2, uuid(), NULL);
 INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield)
-VALUES (@datashowset_id, '姓名', 'username', '2', '', 1, uuid(), '');
+VALUES ((select max(id) from datasearchparam), '姓名', 'username', '2', '', 1, uuid(), '');
 INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield)
-VALUES (@datashowset_id, '手机号', 'mobile', '2', '', 2, uuid(), '');
\ No newline at end of file
+VALUES ((select max(id) from datasearchparam), '手机号', 'mobile', '2', '', 2, uuid(), '');
\ No newline at end of file