From c7a67f56214a93afc3bf0fefdb3e6bdd3e1b1055 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Thu, 4 Jan 2024 17:45:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=AF=E6=B9=BE=E8=BF=87=E6=BB=A4=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SalaryAcctExcelServiceImpl.java      | 64 +++++++++----------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index aab8a8f5a..d074ea11f 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -1619,41 +1619,39 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
     private void buildCanManageList(PltxInitEmployeeParam param, List<String> fieldList, List<pltxEmployeeDTO> canManageList ) {
         Integer txcj = param.getTxcj();
         RecordSet rs = new RecordSet();
+        rs.execute("SELECT bdxr,gskjywr FROM uf_pltxjzgljmb where " + fieldList.get(txcj) + "=" + param.getSpr());
 
-        List<Integer> sprList = new ArrayList<>();
-        for (int i = txcj; i > 0 ; i--) {
-            if (i == txcj) {
-                rs.execute(" SELECT " + fieldList.get(i-1) + " FROM uf_pltxjzgljmb where "+ fieldList.get(i)+"= " + param.getSpr());
-                while (rs.next()) {
-                    sprList.add(rs.getInt(fieldList.get(i-1)));
-                }
-            } else {
-                rs.execute(" SELECT " + fieldList.get(i-1) + " FROM uf_pltxjzgljmb where "+ fieldList.get(i)+ " in ( " + StringUtils.join(sprList, ",") + ")");
-                while (rs.next()) {
-                    sprList.add(rs.getInt(fieldList.get(i-1)));
-                }
-            }
-        }
 
-        // 不包含当前审批人
-        String sprStrWithoutCurrent = StringUtils.join(sprList, ",");
-        // 加上当前审批人
-        sprList.add(param.getSpr());
-        String sprStrs = StringUtils.join(sprList, ",");
-
-        StringBuilder selectConditionStr = new StringBuilder();
-        for (int i = 0; i <= txcj; i++) {
-            if (i != txcj) {
-                selectConditionStr.append(fieldList.get(i) + " in (" + sprStrs + ") or ");
-            } else {
-                selectConditionStr.append(fieldList.get(i) + " in (" + sprStrs + ") ");
-            }
-        }
-        if (StringUtils.isNotBlank(sprStrWithoutCurrent)) {
-            rs.execute(" SELECT bdxr,gskjywr FROM uf_pltxjzgljmb where " + selectConditionStr.toString() + " or bdxr in (" + sprStrWithoutCurrent +") ");
-        } else {
-            rs.execute(" SELECT bdxr,gskjywr FROM uf_pltxjzgljmb where " + selectConditionStr.toString());
-        }
+        // List<Integer> sprList = new ArrayList<>();
+        // for (int i = txcj; i > 0 ; i--) {
+        //     if (i == txcj) {
+        //         rs.execute(" SELECT " + fieldList.get(i-1) + " FROM uf_pltxjzgljmb where "+ fieldList.get(i)+"= " + param.getSpr());
+        //         while (rs.next()) {
+        //             sprList.add(rs.getInt(fieldList.get(i-1)));
+        //         }
+        //     } else {
+        //         rs.execute(" SELECT " + fieldList.get(i-1) + " FROM uf_pltxjzgljmb where "+ fieldList.get(i)+ " in ( " + StringUtils.join(sprList, ",") + ")");
+        //         while (rs.next()) {
+        //             sprList.add(rs.getInt(fieldList.get(i-1)));
+        //         }
+        //     }
+        // }
+        //
+        // // 不包含当前审批人
+        // String sprStrWithoutCurrent = StringUtils.join(sprList, ",");
+        // // 加上当前审批人
+        // sprList.add(param.getSpr());
+        // String sprStrs = StringUtils.join(sprList, ",");
+        //
+        // StringBuilder selectConditionStr = new StringBuilder();
+        // for (int i = 0; i <= txcj; i++) {
+        //     if (i != txcj) {
+        //         selectConditionStr.append(fieldList.get(i) + " in (" + sprStrs + ") or ");
+        //     } else {
+        //         selectConditionStr.append(fieldList.get(i) + " in (" + sprStrs + ") ");
+        //     }
+        // }
+        // rs.execute(" SELECT bdxr,gskjywr FROM uf_pltxjzgljmb where " + selectConditionStr.toString());
 
         while (rs.next()) {
             int bdxr = rs.getInt("bdxr");