From c96108bd84050feb01b47db3f5cae96670fda435 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 30 十月 2024 12:54:24 +0800
Subject: [PATCH] 2024-10-30

---
 src/utils/utils-custom.js |   78 +++++++++++++++++++++++++++++---------
 1 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 88c4d03..e34c81f 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -4071,6 +4071,33 @@
           if @works_flow_countersign@ = 'Y'
           begin
               /* 宸ヤ綔娴侀粯璁ql锛堜細绛撅級 */
+              set @retmsg =''
+              select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
+
+              if @retmsg =''
+              begin
+                  select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
+                  if @retmsg !=''
+                  begin
+                      select @ErrorCode='E', @retmsg='褰撳墠鍗曟嵁宸插鏍革紝璇峰埛鏂板悗閲嶈瘯'
+                      goto aaa
+                  end
+
+                  set @retmsg =''
+                  select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+                  if @retmsg !=''
+                  begin
+                      select @retmsg=workerCode+workerName from BD_workers where id=@retmsg 
+
+                      select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+                      goto aaa
+                  end
+
+                  select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
+                  goto aaa
+              end
+
               declare @works_flow_statuscharone nvarchar(50),@works_flow_statuschartwo nvarchar(50),@works_flow_statuscharthree nvarchar(50),@works_flow_statuscharfour nvarchar(50),@works_flow_statuscharfive nvarchar(50),@works_flow_key_id nvarchar(50),@works_flow_key_status nvarchar(20),@s_my_works_flow_log_param  nvarchar(max),@s_my_works_flow_log_status int,@s_my_works_flow_log_statusname nvarchar(50),@s_my_works_flow_log_detail_id  nvarchar(50)
               select @works_flow_statuscharone='',@works_flow_statuschartwo='',@works_flow_statuscharthree='',@works_flow_statuscharfour='',@works_flow_statuscharfive='',@works_flow_key_id='',@works_flow_key_status ='',@s_my_works_flow_log_param='',@s_my_works_flow_log_status=0,@s_my_works_flow_log_statusname='',@s_my_works_flow_log_detail_id=''
 
@@ -4127,11 +4154,11 @@
           begin
               /* 宸ヤ綔娴侀粯璁ql锛堟垨绛撅級 */
               set @retmsg =''
-              select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@
+              select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
 
               if @retmsg =''
               begin
-                  select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@
+                  select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
 
                   if @retmsg !=''
                   begin
@@ -4141,18 +4168,31 @@
 
                   if @dataM@ !='' 
                   begin
-                      set @retmsg =''
-                      select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0  
+                    set @retmsg =''
+                    select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
 
-                      if @retmsg != ''
+                    if @retmsg != ''
+                    begin
+                        goto goto_mk
+                    end
+                  end
+                  else
+                  begin
+                      set @retmsg =''
+                      select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+                      
+                      if @retmsg !=''
                       begin
-                          goto goto_mk
+                          select @retmsg=workerCode+workerName from BD_workers where id=@retmsg 
+                          
+                          select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+                          goto aaa 
                       end
                   end
-
+                  
                   select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
                   goto aaa 
-              end 
+              end
 
               goto_mk:
 
@@ -4165,7 +4205,7 @@
 
               if @works_begin_branch@ = 'Y'
               begin
-                  update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+                  update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname,works_flow_detail_id=@works_flow_detail_id@
                   where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and typecharone='begin'
               end
               else
@@ -4374,7 +4414,7 @@
       reps.push('db')
     }
 
-    _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -4674,7 +4714,7 @@
       reps.push('db')
     }
 
-    _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -4951,7 +4991,7 @@
     }
     reps.push('mk_obj_name')
 
-    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -5256,7 +5296,7 @@
       reps.push('db')
     }
 
-    sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -5528,7 +5568,7 @@
       reps.push('db')
     }
 
-    sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -5812,7 +5852,7 @@
       reps.push('db')
     }
 
-    _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -5927,7 +5967,7 @@
 
     // reps.push('mk_obj_name')
 
-    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -6051,7 +6091,7 @@
       reps.push('db')
     }
 
-    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -6158,7 +6198,7 @@
       return true
     })
 
-    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     return {LText: sql, md5: md5(sql), reps}
   }
@@ -6254,7 +6294,7 @@
       ${callback}
       `
 
-    _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {

--
Gitblit v1.8.0