From 564b30eed8d0b9353b4256f9b57031e325767c11 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Mon, 22 Aug 2022 15:04:38 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/mapper/scheme/GradeMapper.xml   |  2 +-
 .../organization/mapper/scheme/LevelMapper.xml   |  2 +-
 .../service/impl/DepartmentServiceImpl.java      |  8 ++++++++
 .../service/impl/GroupServiceImpl.java           | 16 ++++++++--------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/com/engine/organization/mapper/scheme/GradeMapper.xml b/src/com/engine/organization/mapper/scheme/GradeMapper.xml
index 9e668044..eecd8dc8 100644
--- a/src/com/engine/organization/mapper/scheme/GradeMapper.xml
+++ b/src/com/engine/organization/mapper/scheme/GradeMapper.xml
@@ -56,7 +56,7 @@
     </select>
     <select id="listUsedId" resultType="java.lang.String">
         select grade_id
-        from JCL_ORG_JOBDT
+        from JCL_ORG_JOB
         where delete_type = 0
     </select>
     <select id="getGradeNameByIds" resultType="java.lang.String">
diff --git a/src/com/engine/organization/mapper/scheme/LevelMapper.xml b/src/com/engine/organization/mapper/scheme/LevelMapper.xml
index 3630fd99..bde2f5f0 100644
--- a/src/com/engine/organization/mapper/scheme/LevelMapper.xml
+++ b/src/com/engine/organization/mapper/scheme/LevelMapper.xml
@@ -72,7 +72,7 @@
         where delete_type = 0
         union
         select level_id
-        from JCL_ORG_JOBDT
+        from JCL_ORG_JOB
         where delete_type = 0
     </select>
     <select id="getTreeData" resultMap="TreeResultMap">
diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
index 17ffff8c..0e006e6d 100644
--- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
+++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
@@ -460,6 +460,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         DepartmentPO targetDepartment = getDepartmentMapper().getDeptById(mergeParam.getDepartment());
         Long parentComp = targetDepartment.getParentComp();
 
+        Set<Long> disableIds = new HashSet<>();
+        disableIds.add(mergeParam.getId());
+        List<DepartmentPO> deptListByPId = getDepartmentMapper().getDeptListByPId(mergeParam.getId());
+        if (CollectionUtils.isNotEmpty(deptListByPId)) {
+            addDisableIds(disableIds, deptListByPId);
+        }
+        OrganizationAssert.isFalse(disableIds.contains(targetDepartment.getId()), "请勿选择当前部门本身及其子部门");
+
         // 所选部门
         DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId());
         mergeDepartment.setDeptName(mergeParam.getMergeName());
diff --git a/src/com/engine/organization/service/impl/GroupServiceImpl.java b/src/com/engine/organization/service/impl/GroupServiceImpl.java
index fbf545c0..59614035 100644
--- a/src/com/engine/organization/service/impl/GroupServiceImpl.java
+++ b/src/com/engine/organization/service/impl/GroupServiceImpl.java
@@ -32,9 +32,10 @@ public class GroupServiceImpl extends Service implements GroupService {
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionItem> selectItems = new ArrayList<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
-        SearchConditionItem companyNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 1, 50, "总部名称", "companyname");
-        SearchConditionItem companyDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 1, 50, "总部全称", "companydesc");
-        SearchConditionItem companyWebItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 1, 60, "公司网站", "companyweb");
+        SearchConditionItem companyNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "总部名称", "companyname");
+        companyNameItem.setRules("required|string");
+        SearchConditionItem companyDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "总部全称", "companydesc");
+        SearchConditionItem companyWebItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "公司网站", "companyweb");
 
         // 赋值
         String id = Util.null2String(params.get("id"));
@@ -57,11 +58,10 @@ public class GroupServiceImpl extends Service implements GroupService {
 
 
         // 设置编辑属性
-        if (!StringUtil.isEmpty(Util.null2String(params.get("viewattr")))) {
-            int viewAttr = Integer.parseInt(params.get("viewattr").toString());
-            companyNameItem.setViewAttr(viewAttr);
-            companyDescItem.setViewAttr(viewAttr);
-            companyWebItem.setViewAttr(viewAttr);
+        if ("1".equals(Util.null2String(params.get("viewattr")))) {
+            companyNameItem.setViewAttr(1);
+            companyDescItem.setViewAttr(1);
+            companyWebItem.setViewAttr(1);
         }
 
         selectItems.add(companyNameItem);