diff --git a/src/com/engine/salary/biz/EmployBiz.java b/src/com/engine/salary/biz/EmployBiz.java index 6de561546..02696ffc2 100644 --- a/src/com/engine/salary/biz/EmployBiz.java +++ b/src/com/engine/salary/biz/EmployBiz.java @@ -180,8 +180,13 @@ public class EmployBiz extends BaseBean { } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { + List resultList = new ArrayList<>(); EmployMapper mapper = sqlSession.getMapper(EmployMapper.class); - return mapper.getDeptInfoList(list); + List> partition = Lists.partition(list, 500); + partition.forEach(part -> { + resultList.addAll(mapper.getDeptInfoList(part)); + }); + return resultList; } finally { sqlSession.close(); } diff --git a/src/com/engine/salary/entity/hrm/DeptInfo.java b/src/com/engine/salary/entity/hrm/DeptInfo.java index 3cc8389b2..92515479e 100644 --- a/src/com/engine/salary/entity/hrm/DeptInfo.java +++ b/src/com/engine/salary/entity/hrm/DeptInfo.java @@ -28,6 +28,12 @@ public class DeptInfo { @I18n private String name; + /** + * 名称 + */ + @I18n + private String departmentMark; + /** * 所属分部id */ diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java index c456e80da..44d3880ce 100644 --- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java +++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java @@ -131,6 +131,9 @@ public class SalaryAcctEmployeePO { @I18n @SalaryFormulaVar(defaultLabel = "部门", labelId = 86321, dataType = "string") private String departmentName; + + @I18n + private String departmentMark; @SalaryFormulaVar(defaultLabel = "部门ID", labelId = 86321, dataType = "string") private Long departmentId; /** diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml index ea614385c..714b41bec 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml @@ -344,7 +344,8 @@