diff --git a/db/23年7月变更.sql b/db/23年7月变更.sql index d6688f65..be52f652 100644 --- a/db/23年7月变更.sql +++ b/db/23年7月变更.sql @@ -38,4 +38,6 @@ ALTER TABLE pay_meeting_situation ADD COLUMN opening_bank varchar(50) NULL COMMENT '开户行', ADD COLUMN bank_account varchar(50) NULL COMMENT '银行账号', ADD COLUMN duty_code varchar(50) NULL COMMENT '信用代码', - ADD COLUMN link_bank_number varchar(50) NULL COMMENT '联行号'; \ No newline at end of file + ADD COLUMN link_bank_number varchar(50) NULL COMMENT '联行号'; +ALTER TABLE pay_meeting_situation + ADD COLUMN invoice_project tinyint(4) NULL COMMENT '发票项目'; diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java index 52608ae0..2b29b1ee 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/AutoPoiDictConfig.java @@ -57,7 +57,9 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI { } } if (dictReplaces != null && dictReplaces.size() != 0) { - log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces.toString()); + if (oConvertUtils.isEmpty(dicTable)) { + log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces.toString()); + } return dictReplaces.toArray(new String[dictReplaces.size()]); } return null; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index 0d96e4bd..5c3a398b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.common.ProjectCommon; import com.jero.common.common.RoleCommon; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.ManagementMessageEnums; @@ -454,9 +455,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl