diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java index 5822cf60..21b9d028 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java @@ -245,7 +245,7 @@ public class TbsActivityController { TbsActivity activity = tbsActivityService.getById(id); TbsCostApply costApply = costApplyService.getById(activity.getCostApplyId()); if(!costApply.getChargeState().equals(TbsCostApplyState.State_0_unPublish.getCode()) - &&!costApply.getChargeState().equals(TbsCostApplyState.State_0_unPublish.getCode())){ + &&!costApply.getChargeState().equals(TbsCostApplyState.State_4_refused.getCode())){ return R.error("因费用状态不支持编辑!!"); } boolean result = tbsActivityService.removeById(id); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index 9da2f9ae..d95ce5cf 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -82,7 +82,7 @@ public class TbsActivityServiceImpl extends ServiceImpl