diff --git a/src/com/engine/salary/entity/salaryacct/param/PltxInitEmployeeParam.java b/src/com/engine/salary/entity/salaryacct/param/PltxInitEmployeeParam.java index c2db38dcb..06ca8a3ec 100644 --- a/src/com/engine/salary/entity/salaryacct/param/PltxInitEmployeeParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/PltxInitEmployeeParam.java @@ -27,7 +27,6 @@ public class PltxInitEmployeeParam { /** * 调薪层级审批人 */ - @DataCheck(require = true, message = "请输入调薪层级审批人") Integer spr; // 生效日期 diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index de3946a32..296ec59b0 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -1493,7 +1493,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc if (StringUtils.isBlank(param.getSxrq())) { throw new SalaryRunTimeException("生效日期不能为空"); } - rs.execute("select id from uf_txjlgljmb where nd='"+ param.getSxrq().substring(0,5) + "'"); + rs.execute("select id from uf_txjlgljmb where nd='"+ param.getSxrq()+ "'"); rs.next(); int mainId = rs.getInt("id"); // 获取明细数据