diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java index 3f15b467..a563d30b 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java @@ -218,6 +218,10 @@ public class ClubUserJoinApplyController { } ProcessInstance processInstance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", userApply.getId())); + // 申请记录存在但没有流程实例时,说明用户仅保存了申请草稿,需提示其先到“我的申请”继续提交。 + if (processInstance == null) { + return Result.error(99, "您有该社团的申请记录尚未提交,请到我的申请里查看!"); + } if (!List.of(ProcessInstanceStateEnum.REJECT.getCode(), ProcessInstanceStateEnum.FINISHED.getCode()).contains(processInstance.getState())) { return Result.error(99, "您有该社团的申请记录尚未完成,请到我的申请里查看!"); } diff --git a/src/main/resources/views/platform/zhghh5/club/clubApproval/index.html b/src/main/resources/views/platform/zhghh5/club/clubApproval/index.html index e6ac0557..450998b5 100644 --- a/src/main/resources/views/platform/zhghh5/club/clubApproval/index.html +++ b/src/main/resources/views/platform/zhghh5/club/clubApproval/index.html @@ -128,7 +128,7 @@ layout("/layouts/platform_h5.html"){ -
退回不同意同意
+
同意拒绝退回
diff --git a/src/main/resources/views/platform/zhghh5/club/mineclub/index.html b/src/main/resources/views/platform/zhghh5/club/mineclub/index.html index 872fa9ce..75b9f050 100644 --- a/src/main/resources/views/platform/zhghh5/club/mineclub/index.html +++ b/src/main/resources/views/platform/zhghh5/club/mineclub/index.html @@ -62,22 +62,48 @@ layout("/layouts/platform_h5.html"){ - + +
+ +
+
+
+

社团基础信息

+ + {{ clubDetail.clubName || '--' }} + {{ clubDetail.foundTime || '--' }} + {{ clubDetail.clubCode || '--' }} + + {{ clubDetail.clubLeader || '--' }} + {{ clubDetail.clubSecretary || '--' }} + {{ clubDetail.currentPeopleNum || 0 }} 人 + {{ clubDetail.due || '--' }} +
暂无
+
暂无
+ 暂无 + 暂无 +
+
+
+
+
+