diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXTAuditController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXTAuditController.java index def9281..3458655 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXTAuditController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXTAuditController.java @@ -66,7 +66,7 @@ public class ClubXTAuditController { @At @ViReturn @RequiresPermissions("sys.club.clubRegist.xtAudit") - public Object doReview(Audit audit, String clubId, Integer pass) { + public Object doReview(Audit audit, String clubId, Integer pass, @Param("..")Sys_club sys_club) { audit.setAuditor(ShiroUtil.getPrincipalProperty("id").toString()); audit.setLoginname(ShiroUtil.getPlatformLoginname()); audit.setUsername(ShiroUtil.getPlatformUsername()); @@ -82,6 +82,7 @@ public class ClubXTAuditController { club.setState(ClubRegistAuditState.XGH_READY); } club.setXtAuditId(audit.getId()); + club.setSchoolReplyFile(sys_club.getSchoolReplyFile()); dao.updateIgnoreNull(club); return null; } @@ -90,7 +91,7 @@ public class ClubXTAuditController { @ViReturn @RequiresPermissions("sys.club.clubRegist.xtAudit") public Object rollback(String id) { - dao.update(Sys_club.class, Chain.make("state", ClubRegistAuditState.XT_READY), Cnd.where("id", "=", id)); + dao.update(Sys_club.class, Chain.make("state", ClubRegistAuditState.XT_READY).add("schoolReplyFile", null), Cnd.where("id", "=", id)); return null; } } diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java index 352689e..20b9820 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java @@ -116,7 +116,6 @@ public class ClubXghReplyController { sysRoleService.clearCache(); club.setFoundTime(StrUtil.blankToDefault(sys_club.getFoundTime(), DateUtil.now())); } - club.setSchoolReplyFile(sys_club.getSchoolReplyFile()); club.setXghAuditId(audit.getId()); dao.updateIgnoreNull(club); return null; @@ -127,7 +126,7 @@ public class ClubXghReplyController { @RequiresPermissions("sys.club.clubRegist.xghReply") public Object rollback(String id) { dao.update(Sys_club.class, Chain.make("state", ClubRegistAuditState.XGH_READY) - .add("foundTime", null).add("schoolReplyFile", null) + .add("foundTime", null) , Cnd.where("id", "=", id)); //删除对应角色 List sysClubUsers = dao.query(Sys_club_user.class, diff --git a/src/main/resources/static/components/club/clubRegistInfo.vue b/src/main/resources/static/components/club/clubRegistInfo.vue index bc8823e..d41750c 100644 --- a/src/main/resources/static/components/club/clubRegistInfo.vue +++ b/src/main/resources/static/components/club/clubRegistInfo.vue @@ -96,8 +96,10 @@ - +