From 7a8ed429ba734f1d8d6ea230c9f08a8dc5e06eaf Mon Sep 17 00:00:00 2001
From: liuliang <401809302@qq.com>
Date: Wed, 5 Jun 2024 17:50:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E6=9C=9F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                        | 5 +----
 src/com/engine/common/util/CommonUtil.java | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

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 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -652,7 +649,7 @@
       <workItem from="1717495483305" duration="5307000" />
       <workItem from="1717551326927" duration="7073000" />
       <workItem from="1717565799282" duration="8912000" />
-      <workItem from="1717577182099" duration="3449000" />
+      <workItem from="1717577182099" duration="3567000" />
     </task>
     <servers />
   </component>
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<Map<String,Object>> 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 =?";