From 4afe2615ec49a34bece7c0b0eee917dee34c1ae8 Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Mon, 7 Aug 2023 14:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ChartServiceImpl.java        | 22 +------------------
 .../service/impl/HrmResourceServiceImpl.java  |  1 +
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java
index e43ee6cb..b0354b88 100644
--- a/src/com/engine/organization/service/impl/ChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java
@@ -407,10 +407,6 @@ public class ChartServiceImpl extends Service implements ChartService {
 
     @Override
     public Map<String, Object> versionRecord(Map<String, Object> params, User user) {
-
-
-
-
         RecordSet rs = new RecordSet();
 
         // 维度
@@ -654,7 +650,7 @@ public class ChartServiceImpl extends Service implements ChartService {
         }
 
 
-        List<Object> insertList = new ArrayList<>();
+        List<Object> insertList;
         List<List<Object>> insertParamList = new ArrayList<>();
         //当前分部版本存储
         rs.executeQuery(subCompanyQuerySql);
@@ -957,22 +953,6 @@ public class ChartServiceImpl extends Service implements ChartService {
                 "department, subcompanyid, subcompany, costcenter,manager, assistant, workcode, classification, " +
                 "versiondate, policy, degree,versionid,lastname,companyworkyear) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," +
                 "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
-//        while (rs.next()) {
-//            insertList = new ArrayList<>();
-//            insertList.add(StringUtils.isBlank(rs.getString("resourceid")) ? null : rs.getInt("resourceid"));
-//            insertList.add(StringUtils.isBlank(rs.getString("managerid")) ? null : rs.getInt("managerid"));
-//            insertList.add(StringUtils.isBlank(rs.getString("subcompanyid")) ? null : rs.getInt("subcompanyid"));
-//            insertList.add(StringUtils.isBlank(rs.getString("departmentid")) ? null : rs.getInt("departmentid"));
-//            insertList.add(rs.getString("managerstr"));
-//            //insertList.add(rs.getString("virtualtype"));
-//            insertList.add(currentDate);
-//            insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId));
-//            insertParamList.add(insertList);
-//        }
-//        String insertVirtualHrmSql = "insert into jcl_chart_resource(resourceid,MANAGER,subcompanyid," +
-//                "departmentid,managerstr," +
-//                //"virtualtype," +
-//                "versiondate,versionid) values (?,?,?,?,?,?,?)";
         insertData(recordSetTrans,insertVirtualHrmSql,insertParamList);
     }
 
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index 592d1984..863926f7 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -891,6 +891,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         }
         DepartmentPO parentDept = departmentPOMap.get(departmentPO.getSupDepId());
         if (null != parentDept) {
+            OrganizationAssert.isFalse(Objects.equals(parentDept.getId(), parentDept.getSupDepId()),parentDept.getDepartmentName()+"数据异常：部门上级不能为自己");
             buildParentDepts(parentDept, builderDeparts,departmentPOMap);
         }
     }