Merge remote-tracking branch 'origin/master'

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java

@@ -92,6 +92,9 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		if(!StringUtils.isBlank(payWorkingGroupSubitem.getChargeCompanyTemporaryName()) && payWorkingGroupSubitem.getChargeCompanyTemporaryName().length() > 50){
 			return Result.error("成员单位长度不能大于50个字符");
 		}
+		if(StringUtils.isBlank(payWorkingGroupSubitem.getWorkingGroupId())){
+			return Result.error("工作组id不能为空！");
+		}
 		Page<PayWorkingGroupSubItem> page = new Page<PayWorkingGroupSubItem>(pageNo, pageSize);
 		IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubitem,paymentDate);
 		return Result.OK(pageList);

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

@@ -52,6 +52,7 @@
         FROM pay_working_group_subitem pwgs
         LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id
         <where>
+            pwgs.working_group_id = #{payWorkingGroupSubItem.workingGroupId}
             <if test="payWorkingGroupSubItem.chargeCompanyTemporaryName != null and payWorkingGroupSubItem.chargeCompanyTemporaryName != ''">
                 AND pwgs.charge_company_temporary_name LIKE
                 concat('%',concat(#{payWorkingGroupSubItem.chargeCompanyTemporaryName},'%'))