Merge branch 'dev_project_branch' into dev

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -49,10 +49,10 @@
         LEFT JOIN project_process pp ON pp.PROJECT_ID = p.ID AND pp.OPERATION = 'close'
         WHERE p.DEL_FLAG = '0'
         AND pp.DEL_FLAG = '0'
-          AND
+        AND(
         <foreach collection="issueIds" item="issueId" separator=" OR ">
             p.ORIGIN_ID = #{issueId}
-              </foreach>
+        </foreach>)
     </select>
 
     <!-- 查询项目信息【处理中】 -->
@@ -79,10 +79,10 @@
           AND ps.DEL_FLAG = '0'
           AND p.`STATUS` = 'pending'
           AND ps.IS_HANDLE = 'unhandled'
-          AND
+          AND(
             <foreach collection="issueIds" item="issueId" separator=" OR ">
               p.ORIGIN_ID = #{issueId}
-            </foreach>
+            </foreach>)
     </select>
 
     <select id="selectShiftProjectList" resultType="com.epmet.dataaggre.dto.govproject.ProjectDTO">