From 249ac92f2e6760f9730fee0658e8d98b42c065b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Thu, 30 Sep 2021 10:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/company/entity/PayCompanyManagement.java  | 2 --
 .../controller/PayWorkingGroupSubItemController.java        | 2 +-
 .../project/mapper/xml/PayWorkingGroupSubItemMapper.xml     | 6 +++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
index 1e760b8e..b114b1e0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
@@ -50,7 +50,6 @@ public class PayCompanyManagement implements Serializable {
 	/**公司电话*/
 	@Excel(name = "公司电话", width = 15)
     @ApiModelProperty(value = "公司电话")
-    @NotEmpty(message = "公司电话不能为空！")
     @Size(max = 15, message = "公司电话长度不能大于15个字符")
     @Pattern(regexp = "^(([0-9]{3,4}-)?[0-9]{7,8})|(((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8})$",message = "公司电话格式错误")
     private String companyPhone;
@@ -64,7 +63,6 @@ public class PayCompanyManagement implements Serializable {
 	/**银行户名*/
 	@Excel(name = "银行户名", width = 15)
     @ApiModelProperty(value = "银行户名")
-    @NotEmpty(message = "银行户名不能为空！")
     @Size(max = 50,message = "银行户名长度不能大于50个字符")
     private String bankAccountName;
 	/**开户行*/
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index b42b4ec9..f97c026e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -131,7 +131,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  * @param pageSize 条数
 	  * @return
 	  */
-	 @ApiOperation(value="工作组项目-工作组项目-分页列表查询", notes="工作组项目-工作组项目-分页列表查询")
+	 @ApiOperation(value="工作组项目-企业端-分页列表查询", notes="工作组项目-企业端-分页列表查询")
 	 @GetMapping(value = "/queryCompanyPageList")
 	 public Result<?> queryCompanyPageList(PayWorkingGroupSubItem payWorkingGroupSubItem,
 										   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
index 7f223a12..cba0dd1c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
@@ -135,13 +135,13 @@
                 AND pwg.working_group_project like concat('%',concat(#{payWorkingGroupSubItem.chargeProject},'%'))
             </if>
             <if test="payWorkingGroupSubItem.pack != null and payWorkingGroupSubItem.pack != ''">
-                AND pwg.pack = #{payWorkingGroupSubItem.pack}
+                AND pwgs.pack = #{payWorkingGroupSubItem.pack}
             </if>
             <if test="payWorkingGroupSubItem.needInvoice != null and payWorkingGroupSubItem.needInvoice != ''">
-                AND pwg.need_invoice = #{payWorkingGroupSubItem.needInvoice}
+                AND pwgs.need_invoice = #{payWorkingGroupSubItem.needInvoice}
             </if>
             <if test="listProjectIds != null and listProjectIds.size() > 0">
-                pwgs.id in
+                AND pwgs.id in
                 <foreach collection="listProjectIds" index="index" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>