企业端我的普通项目接口，工作组接口添加

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;
 	/**开户行*/

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,

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>