diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorCorrelationEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorCorrelationEntity.xml index 44e12246..bf6ae096 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorCorrelationEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorCorrelationEntity.xml @@ -223,7 +223,6 @@ keyProperty="id" useGeneratedKeys="true"> insert into ae_conf_influence_factor_correlation( - id , factor_id , factor_name , mdm_id , @@ -254,7 +253,6 @@ )values( - #{id} , #{factorId} , #{factorName} , #{mdmId} , diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.xml index e06e869d..756d0847 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.xml @@ -205,7 +205,6 @@ keyProperty="id" useGeneratedKeys="true"> insert into ae_conf_influence_factor( - id , ae_conf_module_id , ae_conf_module_name , factor_name , @@ -232,7 +231,6 @@ )values( - #{id} , #{aeConfModuleId} , #{aeConfModuleName} , #{factorName} , diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorServiceImpl.java index 4e381114..34c887e3 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorServiceImpl.java @@ -3,6 +3,8 @@ package com.hzya.frame.voucher.ae.comf.factor.service.impl; import cn.hutool.core.lang.Assert; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.hzya.frame.voucher.ae.comf.factor.dao.IAeConfInfluenceFactorCorrelationDao; +import com.hzya.frame.voucher.ae.comf.factor.entity.AeConfInfluenceFactorCorrelationEntity; import com.hzya.frame.voucher.ae.comf.factor.entity.AeConfInfluenceFactorEntity; import com.hzya.frame.voucher.ae.comf.factor.dao.IAeConfInfluenceFactorDao; import com.hzya.frame.voucher.ae.comf.factor.service.IAeConfInfluenceFactorService; @@ -32,6 +34,8 @@ public class AeConfInfluenceFactorServiceImpl extends BaseService correlationList = aeConfInfluenceFactorCorrelationDao.query(factorCorrelation); + if(correlationList.size()!=0){ + Assert.state(false,"删除失败。该影响因素已被关联,请检查影响因素关联配置。"); + } return aeConfInfluenceFactorDao.logicRemove(entity); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleEntity.xml index 0fc15a61..c234b387 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleEntity.xml @@ -157,7 +157,6 @@ keyProperty="id" useGeneratedKeys="true"> insert into ae_conf_business_module( - id , module_name , def1 , def2 , @@ -180,7 +179,6 @@ )values( - #{id} , #{moduleName} , #{def1} , #{def2} , diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleMdmEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleMdmEntity.xml index 597b3fd0..9bb10b73 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleMdmEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleMdmEntity.xml @@ -200,7 +200,6 @@ keyProperty="id" useGeneratedKeys="true"> insert into ae_conf_business_module_mdm( - id , ae_conf_module_id , ae_conf_module_name , mdm_id , @@ -227,7 +226,6 @@ )values( - #{id} , #{aeConfModuleId} , #{aeConfModuleName} , #{mdmId} ,