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 fieldList, List canManageList ) { Integer txcj = param.getTxcj(); RecordSet rs = new RecordSet(); + rs.execute("SELECT bdxr,gskjywr FROM uf_pltxjzgljmb where " + fieldList.get(txcj) + "=" + param.getSpr()); - List 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 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");