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 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},'%')) - AND pwg.pack = #{payWorkingGroupSubItem.pack} + AND pwgs.pack = #{payWorkingGroupSubItem.pack} - AND pwg.need_invoice = #{payWorkingGroupSubItem.needInvoice} + AND pwgs.need_invoice = #{payWorkingGroupSubItem.needInvoice} - pwgs.id in + AND pwgs.id in #{item}