From f9455c981f94d5fd89103b1d332baefd039bebb2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 25 十月 2024 09:17:14 +0800
Subject: [PATCH] 2024-10-25

---
 src/utils/utils-custom.js |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 88c4d03..863e9c7 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -4127,11 +4127,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 +4141,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:
 

--
Gitblit v1.8.0