From fcb53a4ff023e34126cc25b56b2541edccb92299 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 7 May 2024 17:52:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E6=A0=87=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/browser/bo/CusBowserTreeBO.java           |  2 +-
 .../engine/organization/mapper/comp/CompMapper.xml   | 12 ++++++------
 .../mapper/department/DepartmentMapper.xml           |  4 ++--
 .../organization/service/impl/ChartServiceImpl.java  |  2 +-
 .../service/impl/FunctionOutStaffServiceImpl.java    |  5 ++++-
 .../organization/util/OrganizationFormItemUtil.java  |  4 ++++
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/com/engine/organization/entity/browser/bo/CusBowserTreeBO.java b/src/com/engine/organization/entity/browser/bo/CusBowserTreeBO.java
index 3dfa427b..5afcfeb5 100644
--- a/src/com/engine/organization/entity/browser/bo/CusBowserTreeBO.java
+++ b/src/com/engine/organization/entity/browser/bo/CusBowserTreeBO.java
@@ -26,7 +26,7 @@ public class CusBowserTreeBO {
                         .domid("sel_" + item.getId())
                         .hasChild(item.getIsParent())
                         .isLeaf(!item.getIsParent())
-                        .isopen(false)
+                        .isopen(true)
                         .key(getKey(item))
                         .name(item.getName())
                         .build()).collect(Collectors.toList());
diff --git a/src/com/engine/organization/mapper/comp/CompMapper.xml b/src/com/engine/organization/mapper/comp/CompMapper.xml
index d6f7cec9..648b5856 100644
--- a/src/com/engine/organization/mapper/comp/CompMapper.xml
+++ b/src/com/engine/organization/mapper/comp/CompMapper.xml
@@ -106,7 +106,7 @@
         select
         <include refid="baseColumns"/>
         from hrmsubcompany t
-        WHERE id IN
+        WHERE (t.canceled is null or t.canceled != '1') and id IN
         <foreach collection="ids" index="index" open="(" item="id" separator="," close=")">
             <if test="(index % 999) == 998"> NULL) OR id IN(</if>#{id}
         </foreach>
@@ -117,25 +117,25 @@
         <include refid="baseColumns"/>
         FROM
         hrmsubcompany t
-        WHERE t.SUPSUBCOMID = 0
+        WHERE t.SUPSUBCOMID = 0 and (t.canceled is null or t.canceled != '1')
     </select>
 
     <select id="hasSubs" resultType="java.lang.String">
         select supsubcomid
         from hrmsubcompany
-        where 1=1
+        where (canceled is null or canceled != '1')
         <include refid="subsWhere"/>
         union
         select subcompanyid1
         from hrmdepartment
-        where 1=1
+        where (canceled is null or canceled != '1')
         <include refid="subsWhere"/>
     </select>
 
     <select id="hasDetachSubs" resultType="java.lang.String">
         select supsubcomid
         from hrmsubcompany
-        where 1=1
+        where (canceled is null or canceled != '1')
         <include refid="subsWhere"/>
         and id in
         <foreach collection="companyIds" open="(" item="id" separator="," close=")">
@@ -144,7 +144,7 @@
         union
         select subcompanyid1
         from hrmdepartment
-        where 1=1
+        where (canceled is null or canceled != '1')
         <include refid="subsWhere"/>
         and subcompanyid1 in
         <foreach collection="companyIds" open="(" item="id" separator="," close=")">
diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml
index a21e4c44..272449ad 100644
--- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml
+++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml
@@ -51,7 +51,7 @@
         select
         <include refid="baseColumns"/>
         from hrmdepartment t
-        where 1=1
+        where (t.canceled is null or t.canceled != '1')
         <include refid="likeSQL"/>
         <if test=" departmentPO.subCompanyId1 != null ">
             and t.subCompanyId1 = #{departmentPO.subCompanyId1}
@@ -137,7 +137,7 @@
     <select id="hasSubs" resultType="java.lang.String">
         select distinct supDepId
         from hrmdepartment
-        where 1=1
+        where (canceled is null or canceled != '1')
         <include refid="com.engine.organization.mapper.comp.CompMapper.subsWhere"/>
     </select>
     <select id="countUsedInJob" resultType="java.lang.Integer">
diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java
index bb9755b2..07d26a24 100644
--- a/src/com/engine/organization/service/impl/ChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java
@@ -373,7 +373,7 @@ public class ChartServiceImpl extends Service implements ChartService {
         chartPO.setFname(name);
         // 岗位处理后的ID
         chartPO.setParentId(parentId);
-        chartPO.setExpand("0");
+        chartPO.setExpand("1");
         chartPO.setHasChildren("0");
         chartPO.setBelongto(Util.null2String(belongTo));
         chartPO.setCompanyWorkYear(companyWorkYear);
diff --git a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java
index a5cd07c5..f1efbd2b 100644
--- a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java
+++ b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java
@@ -94,9 +94,12 @@ public class FunctionOutStaffServiceImpl {
                 .sum();
         staffPO.setPermanentNum(sum);
         Integer sums = staffPO.getPermanentNum() + staffPO.getFreezeNum();
+
         //强控策略下不容许超编
         if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) {
-            OrganizationAssert.isFalse(sums.compareTo(staffPO.getStaffNum()) > 0,"强控策略下不容许超编");
+            //冻结数释放
+            OrganizationAssert.isFalse((sums > staffPO.getStaffNum() && staffPO.getFreezeNum() > 0),"强控策略下请先释放当前冻结数后再完成入职操作");
+            OrganizationAssert.isFalse( sums > staffPO.getStaffNum(),"强控策略下不容许超编");
         }
         //向上部门 分部在编数调整
         upwardReviewSums(param);
diff --git a/src/com/engine/organization/util/OrganizationFormItemUtil.java b/src/com/engine/organization/util/OrganizationFormItemUtil.java
index 91697ee1..21e1b1e4 100644
--- a/src/com/engine/organization/util/OrganizationFormItemUtil.java
+++ b/src/com/engine/organization/util/OrganizationFormItemUtil.java
@@ -190,6 +190,10 @@ public class OrganizationFormItemUtil {
             CustomBrowserBean customBrowserBean = JSONObject.parseObject(s, CustomBrowserBean.class);
             customBrowserBean.setHasLeftTree(true);
             customBrowserBean.setLeftToSearchKey("treeKey");
+
+            Map<String,Object> map = new HashMap<>(2);
+            map.put("width",988);
+            customBrowserBean.setModalStyle(map);
             browser.setBrowserConditionParam(customBrowserBean);
         }
         return browser;