From 93c606b6227b1465af43041d1aaad041df3caea6 Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Mon, 18 Oct 2021 09:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/PayWorkingGroupDistributionRecordMapper.xml    |  2 +-
 .../jero/project/mapper/xml/PayWorkingGroupMapper.xml  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml
index 16060376..3ec7a409 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml
@@ -41,7 +41,7 @@
               ail.fileName like  concat('%',concat(#{fileName},'%'))
           </if>
       </where>
-      order by ail.uploadTime desc
+      group by ail.fileId order by ail.uploadTime desc
 
 
 </select>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index a3ffbda0..04a3c97d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -575,7 +575,7 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="ids!= null and ids != ''"> where  pwgs.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
+            <if test="ids!= null and ids != ''"> pwgs.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
 
             <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
                 AND pwg.working_group_project LIKE
@@ -630,7 +630,7 @@
         FROM pay_common_project pcp left JOIN sys_user su on(pcp.principal_id=su.id) left join sys_depart sd
         on(su.org_code=sd.org_code)
         <where>
-            <if test="ids!= null and ids != ''"> where  pcp.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
+            <if test="ids!= null and ids != ''">   pcp.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
 
             <if test="idList != null and idList != ''">
                 pcp.principal_id in
@@ -692,7 +692,7 @@
         FROM pay_member_project pmp  right join  pay_member_project_subitem pmps on(pmp.id=pmps.project_id)
         left  JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
         <where>
-            <if test="ids!= null and ids != ''"> where  pmps.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
+            <if test="ids!= null and ids != ''">   pmps.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
 
             <if test="idList != null and idList != ''">
                 pmp.director_id in
@@ -753,7 +753,7 @@
         FROM pay_meeting pm right join  pay_meeting_situation  pms on(pm.id=pms.meeting_id)
         left  JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
         <where>
-            <if test="ids!= null and ids != ''"> where  pms.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
+            <if test="ids!= null and ids != ''">   pms.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
 
             <if test="idList != null and idList != ''">
                 pm.director_id in
@@ -814,7 +814,7 @@
         FROM tb_member_project tmp left join  tb_member_project_subitem  tmps on(tmp.id=tmps.project_id)
         left  JOIN sys_user su on(tmps.liaison_man_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
         <where>
-            <if test="ids!= null and ids != ''"> where tmps.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
+            <if test="ids!= null and ids != ''">  tmps.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
             <!--标协项目没有负责人所以除最高权限都查不到 -->
             <if test="idList != null and idList != ''">
                 tmps.id=99999999999999999999999