diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 67a9f71..549a0e5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,9 +10,6 @@ - - - diff --git a/src/com/engine/common/util/CommonUtil.java b/src/com/engine/common/util/CommonUtil.java index 88ab857..173103b 100644 --- a/src/com/engine/common/util/CommonUtil.java +++ b/src/com/engine/common/util/CommonUtil.java @@ -653,7 +653,7 @@ public class CommonUtil { log.info("getRqlx calendarSetIdsSets : [{}]",calendarSetIdsSets); List> resultList = Lists.newArrayList(); if (calendarSetIdsSets.size() > 0){ - String sql = "select rqlx from uf_jcl_kq_rlxx where rlmc=? and nd=?"; + String sql = "select rqlx,rq from uf_jcl_kq_rlxx where rlmc=? and nd=?"; resultList = DbTools.getSqlToList(sql,calendarSetIdsSets.toArray()[0],year); if (resultList.size() == 0){ sql = "select subcompanyid1 from hrmresource where id =?";