fix bug:41377

jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
 public class PayWorkingGroupStatistics {
     @ApiModelProperty(value = "主键")
     private String id;
-    @Excel(name = "负责人", width = 15)
+    @Excel(name = "工作组", width = 15)
     @ApiModelProperty(value = "工作组")
     private String workGroup;
     @Excel(name = "应收总金额", width = 15)

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml

@@ -141,13 +141,13 @@
         )
         pwgs on(pwg.id=pwgs.working_group_id)
         <where>
-            pwgs.comeAllMoney is not null
               <if test="ids != null and ids != ''">
                  and  pwg.principal_id_a in
                   <foreach item="item" open="(" separator="," close=")" collection="ids">
                       #{item}
                   </foreach>
               </if>
+                    and  pwgs.comeAllMoney is not null
               <if test="payWorkingGroupSearch.workGroup != null and payWorkingGroupSearch.workGroup != ''">
                   and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%'))
               </if>
@@ -165,11 +165,10 @@
                       </if>
                   </otherwise>
               </choose>
-
         </where>) ppp order by  ppp.payment_date desc
-    </select>
+</select>
 
-    <!--    工作组统计ids-->
+<!--    工作组统计ids-->
     <select id="queryPageListForStatisticsIds" resultType="com.jero.project.entity.PayWorkingGroupStatistics">
         select ppp.id,ppp.workGroup, ppp.allMoney,ppp.comeAllMoney,ppp.moneyRate from (SELECT
         pwg.id,