From cdf242ed87baf76c97191fcaaf3581f1ec7c42be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=8A=E6=98=8A?=
<7541381+haohao0529@user.noreply.gitee.com>
Date: Mon, 11 May 2020 16:24:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1=E5=99=A8?=
=?UTF-8?q?=E4=B8=AD=20=E5=8F=B3=E9=94=AE=E6=B5=81=E7=A8=8B=E8=8A=82?=
=?UTF-8?q?=E7=82=B9=E2=80=94=E2=80=94=E8=A1=A8=E5=8D=95=E6=96=B9=E6=A1=88?=
=?UTF-8?q?=E2=80=94=E2=80=94=E7=BB=91=E5=AE=9A=E8=A1=A8=E5=8D=95=E5=BA=93?=
=?UTF-8?q?=E8=A1=A8=E5=8D=95=20=20=E9=80=89=E6=8B=A9=E8=AE=BE=E8=AE=A1?=
=?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8A=A5=E9=94=99=EF=BC=8C=E7=BB=8F=E6=9F=A5?=
=?UTF-8?q?sys=5Fmapdata=E8=A1=A8=E4=B8=AD=E6=97=A0OrgNo=EF=BC=88=E5=89=8D?=
=?UTF-8?q?=E5=8F=B0=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E7=9A=84=EF=BC=9A?=
=?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BB=84=E7=BB=87=EF=BC=89=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=EF=BC=8C=E6=9C=AC=E6=AC=A1=E5=B0=86OrgNo=E6=94=B9=E4=B8=BA?=
=?UTF-8?q?=E4=BA=86DesignerUnit=20=EF=BC=88=E6=95=B0=E6=8D=AE=E5=BA=93?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A=EF=BC=9A=E5=8D=95=E4=BD=8D=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BP/WF/HttpHandler/WF_Admin_AttrNode_FrmSln.java | 10 +++++-----
.../WF/Admin/AttrNode/FrmSln/11.RefOneFrmTreeFrms.htm | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/jflow-core/src/main/java/BP/WF/HttpHandler/WF_Admin_AttrNode_FrmSln.java b/jflow-core/src/main/java/BP/WF/HttpHandler/WF_Admin_AttrNode_FrmSln.java
index b815a227..7d1a46c9 100644
--- a/jflow-core/src/main/java/BP/WF/HttpHandler/WF_Admin_AttrNode_FrmSln.java
+++ b/jflow-core/src/main/java/BP/WF/HttpHandler/WF_Admin_AttrNode_FrmSln.java
@@ -26,7 +26,7 @@ public class WF_Admin_AttrNode_FrmSln extends WebContralBase
{
sql += "SELECT b.NAME AS SortName, a.No, A.Name,";
sql += "A.PTable,";
- sql += "A.OrgNo ";
+ sql += "A.DesignerUnit ";
sql += "FROM ";
sql += "Sys_MapData A, ";
sql += "Sys_FormTree B ";
@@ -41,7 +41,7 @@ public class WF_Admin_AttrNode_FrmSln extends WebContralBase
{
sql += "SELECT b.NAME AS SortName, a.No, A.Name, ";
sql += "A.PTable, ";
- sql += "A.OrgNo ";
+ sql += "A.DesignerUnit ";
sql += "FROM ";
sql += "Sys_MapData A, ";
sql += "Sys_FormTree B ";
@@ -56,7 +56,7 @@ public class WF_Admin_AttrNode_FrmSln extends WebContralBase
{
sql += "select * from (SELECT b.NAME AS SortName, a.No, A.Name,";
sql += "A.PTable,";
- sql += "A.OrgNo ,b.idx as idx1,a.idx as idx2 ";
+ sql += "A.DesignerUnit ,b.idx as idx1,a.idx as idx2 ";
sql += "FROM ";
sql += "Sys_MapData A, ";
sql += "Sys_FormTree B ";
@@ -67,7 +67,7 @@ public class WF_Admin_AttrNode_FrmSln extends WebContralBase
sql += " UNION ";
sql += "select * from (SELECT b.NAME AS SortName, a.No, A.Name,";
- sql += "A.PTable,A.OrgNo ,b.idx as idx1,a.idx as idx2 ";
+ sql += "A.PTable,A.DesignerUnit ,b.idx as idx1,a.idx as idx2 ";
sql += " FROM ";
sql += "Sys_MapData A, Sys_FormTree B, WF_FrmOrg C ";
sql += " WHERE ";
@@ -87,7 +87,7 @@ public class WF_Admin_AttrNode_FrmSln extends WebContralBase
dt.Columns.get("NO").ColumnName = "No";
dt.Columns.get("NAME").ColumnName = "Name";
dt.Columns.get("PTABLE").ColumnName = "PTable";
- dt.Columns.get("ORGNO").ColumnName = "OrgNo";
+ dt.Columns.get("DESIGNERUNIT").ColumnName = "DesignerUnit";
}
return BP.Tools.Json.ToJson(dt);
diff --git a/jflow-web/src/main/webapp/WF/Admin/AttrNode/FrmSln/11.RefOneFrmTreeFrms.htm b/jflow-web/src/main/webapp/WF/Admin/AttrNode/FrmSln/11.RefOneFrmTreeFrms.htm
index 1cd42f54..0a89becb 100644
--- a/jflow-web/src/main/webapp/WF/Admin/AttrNode/FrmSln/11.RefOneFrmTreeFrms.htm
+++ b/jflow-web/src/main/webapp/WF/Admin/AttrNode/FrmSln/11.RefOneFrmTreeFrms.htm
@@ -1,4 +1,4 @@
-
+
@@ -54,7 +54,7 @@
html += "| " + en.No + " | ";
html += "" + en.Name + " | ";
html += "" + en.PTable + " | ";
- html += "" + en.OrgNo + " | ";
+ html += "" + en.DesignerUnit + " | ";
html += "绑定 | ";
html += "";
}
--
Gitee