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 1/2] =?UTF-8?q?=E9=9D=9E=E6=A0=87=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=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;

From 5da821d65375c142f7284f2ea6ec18cb03cddef4 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 8 May 2024 16:34:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?=
 =?UTF-8?q?=E5=9B=BE=E9=83=A8=E9=97=A8=E8=AF=A6=E7=BB=86=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=20=EF=BC=881.=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=91=98=E7=82=B9=E5=87=BB=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=EF=BC=8C2.=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8A=A0=E8=BD=BD=E6=95=88=E7=8E=87=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=9B=BE=E5=B1=95=E7=A4=BA=E4=B8=8D=E5=85=A8?=
 =?UTF-8?q?=EF=BC=9B3.=E8=A7=A3=E9=99=A4=E9=BB=98=E8=AE=A4=E4=B8=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=B2=97=E4=BD=8D=E5=8A=9F=E8=83=BD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/department/bo/DepartmentBO.java      | 17 ++++++++++++-----
 .../resource/JclOrgCustomTemplateMapper.java    |  2 +-
 .../resource/JclOrgCustomTemplateMapper.xml     |  4 ++--
 .../service/impl/ExportCommonServiceImpl.java   | 13 +++++++++----
 .../service/impl/HrmResourceServiceImpl.java    |  2 +-
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
index ac13e899..3abe5801 100644
--- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java
+++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
@@ -5,6 +5,7 @@ import com.engine.organization.entity.department.param.DeptSearchParam;
 import com.engine.organization.entity.department.po.DepartmentPO;
 import com.engine.organization.entity.department.vo.SingleDeptTreeVO;
 import com.engine.organization.entity.searchtree.SearchTree;
+import com.engine.organization.exception.OrganizationRunTimeException;
 import com.engine.organization.mapper.department.DepartmentMapper;
 import com.engine.organization.util.db.MapperProxyFactory;
 import org.apache.commons.collections.CollectionUtils;
@@ -32,17 +33,21 @@ public class DepartmentBO {
      * @return
      */
     public static List<DepartmentListDTO> buildDeptDTOShowNames(Collection<DepartmentListDTO> list) {
-        SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
-        DepartmentComInfo departmentComInfo = new DepartmentComInfo();
         return list.stream().peek(e -> {
-                    e.setSubCompanyName((null == e.getSubCompanyId1() || 0 == e.getSubCompanyId1()) ? "" : subCompanyComInfo.getSubCompanyname(Util.null2String(e.getSubCompanyId1())));
-                    e.setSupDepName((null == e.getSupDepId() || 0 == e.getSupDepId()) ? "" : departmentComInfo.getDepartmentname(Util.null2String(e.getSupDepId())));
+                    List<DepartmentListDTO> children = e.getChildren();
+                    if (CollectionUtils.isNotEmpty(children)){
+                        List<DepartmentListDTO> collect = children.stream().peek(item -> item.setBmfzr(getEmployeeNameById(item.getId()))).collect(Collectors.toList());
+                        e.setChildren(collect);
+                    }
                     e.setBmfzr(getEmployeeNameById(e.getId()));
                 }
         ).collect(Collectors.toList());
     }
 
     public static List<DepartmentListDTO> buildDeptDTOList(Collection<DepartmentPO> list, String orderType) {
+        SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+        DepartmentComInfo departmentComInfo = new DepartmentComInfo();
+
         // 递归添加父级数据
         List<DepartmentListDTO> dtoList = list.stream().map(e ->
                 DepartmentListDTO
@@ -53,6 +58,8 @@ public class DepartmentBO {
                         .departmentCode(e.getDepartmentCode())
                         .subCompanyId1(e.getSubCompanyId1())
                         .supDepId(e.getSupDepId())
+                        .subCompanyName((null == e.getSubCompanyId1() || 0 == e.getSubCompanyId1()) ? "" : subCompanyComInfo.getSubCompanyname(Util.null2String(e.getSubCompanyId1())))
+                        .supDepName((null == e.getSupDepId() || 0 == e.getSupDepId()) ? "" : departmentComInfo.getDepartmentname(Util.null2String(e.getSupDepId())))
                         .showOrder(null == e.getShowOrder() ? 0 : e.getShowOrder())
                         .canceled(null == e.getCanceled() ? 0 : e.getCanceled())
                         .orderType(orderType)
@@ -189,7 +196,7 @@ public class DepartmentBO {
                 }
             }
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new OrganizationRunTimeException(e);
         }
         return StringUtils.join(employeeNameById, ",");
     }
diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java
index f2a095d5..37901863 100644
--- a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java
+++ b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java
@@ -26,7 +26,7 @@ public interface JclOrgCustomTemplateMapper {
 
     int updateByPrimaryKey(JclOrgCustomTemplatePO record);
 
-    List<JclOrgCustomTemplatePO> listAll();
+    List<JclOrgCustomTemplatePO> listAllByCreator(@Param("creator") Integer creator);
 
     List<Long> listAllId();
 
diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
index 3343baf8..fc060340 100644
--- a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
+++ b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
@@ -28,10 +28,10 @@
         from jcl_org_custom_template
         where  id = #{id,jdbcType=INTEGER} 
     </select>
-    <select id="listAll" resultMap="BaseResultMap">
+    <select id="listAllByCreator" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
-        from jcl_org_custom_template order by id
+        from jcl_org_custom_template where creator = #{creator} order by id
     </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
diff --git a/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java
index 117da446..55899d43 100644
--- a/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java
@@ -28,6 +28,8 @@ import com.engine.organization.util.excel.ExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import weaver.general.Util;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -104,7 +106,7 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
         List<String> headerList = new ArrayList<>();
         List<Object> headerNameList = new ArrayList<>();
         OrganizationWeaTable<HrmResourceVO> table = new OrganizationWeaTable<>(user, HrmResourceVO.class);
-        String sqlWhere = " where 1 = 1 and t.status < 4 and (t.accounttype is null or t.accounttype != 1)";
+        String sqlWhere = " where 1 = 1 and (t.accounttype is null or t.accounttype != 1)";
         // 分权查询
         DetachUtil detachUtil = new DetachUtil(user);
         String parentCompanyIds = detachUtil.getJclRoleLevels();
@@ -215,10 +217,11 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
 
     @Override
     public XSSFWorkbook departmentExport() {
+        SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+        DepartmentComInfo departmentComInfo = new DepartmentComInfo();
         String orderSql = PageInfoSortUtil.getSortSql("", " showorder ");
         List<DepartmentPO> allList = getDepartmentMapper().listAll(orderSql);
         new DetachUtil(user).filterDepartmentList(allList);
-        Map<Integer, DepartmentPO> poMaps = allList.stream().collect(Collectors.toMap(DepartmentPO::getId, item -> item));
         List<DepartmentListDTO> dtoList = allList.stream().map(e ->
                 DepartmentListDTO
                         .builder()
@@ -226,8 +229,10 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
                         .departmentMark(e.getDepartmentMark())
                         .departmentName(e.getDepartmentName())
                         .departmentCode(e.getDepartmentCode())
-                        .subCompanyName(0 == e.getSubCompanyId1() ? "" : MapperProxyFactory.getProxy(CompMapper.class).listById(e.getSubCompanyId1()).getSubCompanyName())
-                        .supDepName(null == poMaps.get(e.getSupDepId()) ? "" : poMaps.get(e.getSupDepId()).getDepartmentName())
+                        .subCompanyId1(e.getSubCompanyId1())
+                        .supDepId(e.getSupDepId())
+                        .subCompanyName((null == e.getSubCompanyId1() || 0 == e.getSubCompanyId1()) ? "" : subCompanyComInfo.getSubCompanyname(Util.null2String(e.getSubCompanyId1())))
+                        .supDepName((null == e.getSupDepId() || 0 == e.getSupDepId()) ? "" : departmentComInfo.getDepartmentname(Util.null2String(e.getSupDepId())))
                         .bmfzr(DepartmentBO.getEmployeeNameById(e.getId()))
                         .canceled(null == e.getCanceled() ? 0 : e.getCanceled())
                         .build()).collect(Collectors.toList());
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index ef7db662..1bae9507 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -686,7 +686,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         infoPOList.add(ExtendInfoPO.builder().viewAttr(1).id(null).fieldName("createTime").fieldNameDesc("创建时间").fieldType("date").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(2).isrequired(0).isSystemDefault(0).build());
         Map<String, Object> tabInfoMap = new HashMap<>();
         tabInfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, false, true));
-        List<JclOrgCustomTemplatePO> jclOrgCustomTemplatePOS = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).listAll();
+        List<JclOrgCustomTemplatePO> jclOrgCustomTemplatePOS = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).listAllByCreator(user.getUID());
         List<Integer> isUsed = new ArrayList<>();
         AtomicInteger index = new AtomicInteger(0);
         List<Map<String, Object>> collect = jclOrgCustomTemplatePOS.stream().map(item -> {