c-zhouhf1/zhgh_hmc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-01-10 09:18:38 +08:00
parent f67d610fbb
commit f5d963cb06
7 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXTAuditController.java
+3 -2
View File
@@ -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;
}
}
src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java
+1 -2
View File
@@ -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<Sys_club_user> sysClubUsers = dao.query(Sys_club_user.class,