diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java index 715b3bf..86a7055 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java @@ -142,9 +142,10 @@ public class ActivityReimbursementMineController { @RequiresPermissions("sys.jf.reimbursement.mine") @Aop(TransAop.READ_COMMITTED) public Object doDelete(String id) { - activityBxService.update(Chain.make("reimbursement_state_id", null) + /*activityBxService.update(Chain.make("reimbursement_state_id", null) .add("reimbursement_apply_time", null).add("reimbursement_state_id",null), - Cnd.where("id", "=", id)); + Cnd.where("id", "=", id));*/ + activityBxService.delete(id); ReimbursementToHandler.DELETE_PROCESS_AND_TASK.exec(id,null); return null; } diff --git a/src/main/resources/views/platform/jf/reimbursement/apply.html b/src/main/resources/views/platform/jf/reimbursement/apply.html index 9035cd9..f70e02d 100644 --- a/src/main/resources/views/platform/jf/reimbursement/apply.html +++ b/src/main/resources/views/platform/jf/reimbursement/apply.html @@ -70,19 +70,19 @@ layout("/layouts/platform.html"){ - 导出活动参加人员 - --> +