commit

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java

@@ -241,10 +241,14 @@ public class SysClubUserCon {
         //暂时屏蔽了校工会审核
         //int status = ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") ? 5 : 3;
         int status = 0;
-        if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") || sf == 2) {
+        if(sf == 2) {
             status = 5;
         } else {
-            status = 3;
+            if(ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) {
+                status = 5;
+            } else {
+                status = 3;
+            }
         }
 
         //查询校协会管理员

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java

@@ -15,6 +15,7 @@ import io.v.nutz.sys.constant.club.ClubRegistAuditState;
 import io.v.nutz.sys.controllers.platform.sys.handler.ClubUserApplyToDoHandler;
 import io.v.nutz.sys.models.Sys_club;
 import io.v.nutz.sys.models.Sys_club_user;
+import io.v.nutz.sys.models.Sys_user;
 import io.v.nutz.sys.services.SysClubService;
 import io.v.nutz.sys.services.SysClubUserService;
 import io.v.nutz.web.commons.utils.ShiroUtil;
@@ -139,16 +140,36 @@ public class ClubApplyInController {
         return sysClubService.listPage(pageNumber, pageSize, sql);
     }
 
+    @At
+    @ViReturn
+    @RequiresPermissions("sys.club.sq")
+    @Aop(TransAop.READ_COMMITTED)
+    public Object validApply() {
+        //查询是否是会员
+        Sys_user sysUser = dao.fetch(Sys_user.class, ShiroUtil.getUserId());
+        if(sysUser.getMember() != 1) {
+            return Result.error("您当前不是会员，无法申请");
+        }
+        int count = dao.count(Sys_club_user.class, Cnd.where("userid", "=", ShiroUtil.getUserId()).and("isNormal", "=", true));
+        if(count >= 3) {
+            return Result.error("您已参与3个协会，无法申请");
+        }
+        return Result.success();
+    }
 
     @At
     @ViReturn
     @RequiresPermissions("sys.club.sq")
     @Aop(TransAop.READ_COMMITTED)
     public Object submit(Sys_club_user sys_club_user) {
+
         Sys_club sysClub = dao.fetch(Sys_club.class, sys_club_user.getClubid());
         Sys_club_user sysClubUser = dao.fetch(Sys_club_user.class, Cnd.where("clubid", "=", sys_club_user.getClubid()).and("userid", "=", ShiroUtil.getUserId()));
-        sys_club_user.setInvite(sysClubUser.getInvite());
-
+        if(sysClubUser == null) {
+            sys_club_user.setInvite(false);
+        } else {
+            sys_club_user.setInvite(sysClubUser.getInvite());
+        }
         sysClubUserService.clear(Cnd.where("clubid", "=", sys_club_user.getClubid()).and("userid", "=", ShiroUtil.getPrincipalProperty("id")));
         boolean isInvite = sys_club_user.getInvite() && Objects.equals(sysClub.getState(), ClubRegistAuditState.NOT_SUBMIT);