From 2ea741211f79b6ee21cad0227bd1dc35a3cf7500 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Thu, 8 Aug 2024 16:15:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=9D=9E=E6=A0=87=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E6=B5=8F=E8=A7=88=E6=8C=89=E9=92=AE=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/entity/extend/bo/ExtendInfoBO.java      | 4 ++++
 .../organization/entity/staff/vo/StaffTableVO.java       | 9 ++++++++-
 .../organization/util/OrganizationFormItemUtil.java      | 2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
index 570b621c..a520d0fa 100644
--- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
+++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
@@ -411,6 +411,10 @@ public class ExtendInfoBO {
                                 searchConditionItem = new SearchConditionItem(ConditionType.BROWSER, fieldlabel, new String[]{fieldname}, browserbean);
                             } else {
                                 searchConditionItem = conditionFactory.createCondition(ConditionType.BROWSER, fieldlabel, fieldname, detailtype);
+                                //隐藏虚拟组织
+                                if(searchConditionItem != null ) {
+                                    searchConditionItem.getBrowserConditionParam().setHideVirtualOrg(true);
+                                }
                             }
                             // 岗位浏览按钮
                             if ("666".equals(detailtype)) {
diff --git a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java
index 526a864a..363af91e 100644
--- a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java
+++ b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java
@@ -18,7 +18,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @OrganizationTable(pageId = "0cdfd5bb-dc09-11ec-b69e-00ffcbed7508",
-        fields = "t.id,t.is_used,s.control_dimension,t.plan_id,t.comp_id,t.dept_id,t.job_id,t.staff_num,t.permanent_num,t.freeze_num,t.lack_status,t.staff_desc",
+        fields = "t.id,t.is_used,s.control_dimension,t.plan_id,t.comp_id,t.dept_id,t.job_id,t.staff_num,t.permanent_num,t.freeze_num,t.lack_status,t.staff_desc,t.description",
         fromSql = "FROM jcl_org_staff t inner join jcl_org_staffplan s on t.plan_id = s.id",
         orderby = "id desc",
         primarykey = "id",
@@ -91,4 +91,11 @@ public class StaffTableVO {
     @OrganizationTableColumn(labelId = 547349, text = "编制描述", width = "10%", column = "staff_desc")
     private String staffDesc;
 
+    /**
+     * 描述说明
+     */
+    @OrganizationTableColumn(labelId = 547142, text = "描述说明", width = "10%", column = "description")
+    private String description;
+
+
 }
diff --git a/src/com/engine/organization/util/OrganizationFormItemUtil.java b/src/com/engine/organization/util/OrganizationFormItemUtil.java
index 481eb5ab..31a28eac 100644
--- a/src/com/engine/organization/util/OrganizationFormItemUtil.java
+++ b/src/com/engine/organization/util/OrganizationFormItemUtil.java
@@ -162,6 +162,8 @@ public class OrganizationFormItemUtil {
         browser.setViewAttr(viewAttr);
         browser.setIsQuickSearch(isQuickSearch);
         browser.setLabel(label);
+        //隐藏虚拟组织
+        browser.getBrowserConditionParam().setHideVirtualOrg(true);
         if ("161".equals(type) || "162".equals(type)) {
             fieldDbType = "browser." + fieldDbType;
             BrowserBean browserBean = new BrowserBean();