From fc9d786a834dccb8d33c711e05bf9c7709ae7508 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Fri, 11 Apr 2025 13:24:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/Flow/FlowRuntime.cs        |  6 ++---
 OpenAuth.Mvc/wwwroot/js/flowlayout.js   | 31 ++++++++++++++-----------
 OpenAuth.Mvc/wwwroot/userJs/nodeInfo.js | 22 +++++++-----------
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/OpenAuth.App/Flow/FlowRuntime.cs b/OpenAuth.App/Flow/FlowRuntime.cs
index 478cec7d..9a0e7e81 100644
--- a/OpenAuth.App/Flow/FlowRuntime.cs
+++ b/OpenAuth.App/Flow/FlowRuntime.cs
@@ -761,10 +761,10 @@ namespace OpenAuth.App.Flow
 
         /// <summary>
         /// 替换SQL中的权限占位符
-        /// <para>如：select id from sysuser where parentId = {loginUser}</para>
-        /// <para>替换后：select id from sysuser where parentId = '123'</para>
-        /// <para>如：select id from sysuser where parentId = {loginUser}</para>
+        /// <para>如当前用户的全部下属：select id from sysuser where parentId = {loginUser}</para>
         /// <para>替换后：select id from sysuser where parentId = '123'</para>
+        /// <para>如d登录用户同部门的人：select id from sysuser where id in (select firstid from relevance where secondid in ({loginOrg}) and relkey = 'UserOrg')</para>
+        /// <para>替换后： select id from sysuser where id in (select firstid from relevance where secondid in ('123','456') and relkey = 'UserOrg')</para>
         /// </summary>
         /// <param name="sql"></param>
         /// <returns></returns>
diff --git a/OpenAuth.Mvc/wwwroot/js/flowlayout.js b/OpenAuth.Mvc/wwwroot/js/flowlayout.js
index 68f162c0..6fc97cb4 100644
--- a/OpenAuth.Mvc/wwwroot/js/flowlayout.js
+++ b/OpenAuth.Mvc/wwwroot/js/flowlayout.js
@@ -271,26 +271,29 @@
                             _popoverhtml += '<li>类型:' + _NodeDesignate[item.setInfo.NodeDesignate] + '</li>';
                             if (item.setInfo.NodeDesignateData != undefined) {
                                 var _rowstr = "";
-                                for (var i in item.setInfo.NodeDesignateData.roles) {
-                                    var _postitem = item.setInfo.NodeDesignateData.roles[i];
-                                    var _one = top.clientroleData[_postitem];
-                                    _rowstr += ' <span class="label label-success">' +
+
+                                if(item.setInfo.NodeDesignate == "SPECIAL_ROLE"){  //指定角色
+                                    for (var i in item.setInfo.NodeDesignateData.datas) {
+                                        var _postitem = item.setInfo.NodeDesignateData.datas[i];
+                                        var _one = top.clientroleData[_postitem];
+                                        _rowstr += ' <span class="label label-success">' +
                                         (_one == undefined ? _postitem : _one.FullName) +
                                         '</span>';
-                                    if (i == item.setInfo.NodeDesignateData.roles.length - 1) {
-                                        _popoverhtml += '<li>角色:' + _rowstr + '</li>';
+                                        if (i == item.setInfo.NodeDesignateData.datas.length - 1) {
+                                            _popoverhtml += '<li>角色:' + _rowstr + '</li>';
+                                        }
                                     }
                                 }
-
-                                _rowstr = "";
-                                for (var i in item.setInfo.NodeDesignateData.users) {
-                                    var _postitem = item.setInfo.NodeDesignateData.users[i];
-                                    var _one = clientuserData[_postitem];
-                                    _rowstr += ' <span class="label label-danger">' +
+                                else if(item.setInfo.NodeDesignate == "SPECIAL_USER"){  //指定用户
+                                    for (var i in item.setInfo.NodeDesignateData.datas) {
+                                        var _postitem = item.setInfo.NodeDesignateData.datas[i];
+                                        var _one = top.clientuserData[_postitem];
+                                        _rowstr += ' <span class="label label-danger">' +
                                         (_one == undefined ? _postitem : _one.RealName) +
                                         '</span>';
-                                    if (i == item.setInfo.NodeDesignateData.users.length - 1) {
-                                        _popoverhtml += '<li>用户:' + _rowstr + '</li>';
+                                        if (i == item.setInfo.NodeDesignateData.datas.length - 1) {
+                                            _popoverhtml += '<li>用户:' + _rowstr + '</li>';
+                                        }
                                     }
                                 }
                             }
diff --git a/OpenAuth.Mvc/wwwroot/userJs/nodeInfo.js b/OpenAuth.Mvc/wwwroot/userJs/nodeInfo.js
index 121e14d5..de8aa35c 100644
--- a/OpenAuth.Mvc/wwwroot/userJs/nodeInfo.js
+++ b/OpenAuth.Mvc/wwwroot/userJs/nodeInfo.js
@@ -5,8 +5,7 @@ layui.config({
         transfer = layui.transfer,
         $ = layui.jquery;
     var form = layui.form;
-    var users = []; //节点的执行人
-    var roles = []; //节点执行角色
+    var datas = []; //节点的执行人
 
     var index = layer.getFrameIndex(window.name); //获取窗口索引
     //从flowschemes.js进入的节点信息
@@ -48,8 +47,7 @@ layui.config({
     //初始化节点设置信息
     if (node.setInfo != null) {
         vm.tmp = Object.assign({}, vm.tmp, node.setInfo)
-        users = node.setInfo.NodeDesignateData.users;
-        roles = node.setInfo.NodeDesignateData.roles;
+        datas = node.setInfo.NodeDesignateData.datas;
     }
     // form.render(); //重新渲染，防止radio/select等失效
 
@@ -143,15 +141,15 @@ layui.config({
                       //  console.log(data); //得到当前被穿梭的数据
                       //  console.log(index); //如果数据来自左边，index 为 0，否则为 1
                         if (index === 0) {
-                            roles = roles.concat(data.map(u =>u.value));
+                            datas = datas.concat(data.map(u =>u.value));
                         } else {
-                            roles = roles.filter(el => !(data.map(u =>u.value).includes(el))); 
+                            datas = datas.filter(el => !(data.map(u =>u.value).includes(el))); 
                         }
-                        console.log(roles);
+                        console.log(datas);
                     }
                     ,title: ['系统角色', '已分配角色']
                     ,data: json.Result
-                    ,value: roles
+                    ,value: datas
                 });
             });
         };
@@ -222,11 +220,11 @@ layui.config({
         function (data) {
             vm.tmp.NodeDesignate = data.value;
             if (data.value === "SPECIAL_USER") {
-                roles = [];
+                datas = [];
                 userstree.load();
                 ztree.reload();
             } else if (data.value === "SPECIAL_ROLE") {
-                users = [];
+                datas = [];
                 rolestransfer.load();
             }
         });
@@ -235,9 +233,7 @@ layui.config({
     getVal = function () {
         var result = {
             NodeDesignateData: { //节点指定操作人
-                users: users,
-                roles: roles,
-                orgs: []
+                datas: datas
             }
         };
       //  $.extend(result, vm.tmp);