社团管理相关接口权限添加修改

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -130,7 +130,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/wx/user/getToken").permitAll()
                 .antMatchers("/wx/user/getToken").permitAll()
                 //开发一个接口字典
                 //开发一个接口字典
                 .antMatchers("/system/dict/data/type/**").permitAll()
                 .antMatchers("/system/dict/data/type/**").permitAll()
-                .antMatchers("/**").permitAll()
+//                .antMatchers("/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .anyRequest().authenticated()
             .and()
             .and()

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationActivationRecord.java

@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.domain.organization;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.Data;
@@ -21,9 +23,6 @@ public class SchoolOrganizationActivationRecord extends OurBaseEntity
 {
 {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    /** $column.columnComment */
-    private Long id;
-
     /** 活动主题 */
     /** 活动主题 */
     @Excel(name = "活动主题")
     @Excel(name = "活动主题")
     private String theme;
     private String theme;

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationFc.java

 package yangtz.cs.liu.campus.domain.organization;
 package yangtz.cs.liu.campus.domain.organization;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import lombok.Data;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -18,9 +20,6 @@ public class SchoolOrganizationFc extends OurBaseEntity
 {
 {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    /** $column.columnComment */
-    private Long id;
-
     /** 对应的社团id */
     /** 对应的社团id */
     @Excel(name = "对应的社团id")
     @Excel(name = "对应的社团id")
     private Long cid;
     private Long cid;

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationInfo.java

 package yangtz.cs.liu.campus.domain.organization;
 package yangtz.cs.liu.campus.domain.organization;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import lombok.Data;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -17,9 +19,6 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class SchoolOrganizationInfo extends OurBaseEntity {
 public class SchoolOrganizationInfo extends OurBaseEntity {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    /** $column.columnComment */
-    private Long id;
-
     /** 社团名称 */
     /** 社团名称 */
     @Excel(name = "社团名称")
     @Excel(name = "社团名称")
     private String name;
     private String name;

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationMember.java

 package yangtz.cs.liu.campus.domain.organization;
 package yangtz.cs.liu.campus.domain.organization;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import lombok.Data;
 import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
@@ -15,9 +17,6 @@ public class SchoolOrganizationMember extends OurBaseEntity
 {
 {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    /** $column.columnComment */
-    private Long id;
-
     /** 社团id */
     /** 社团id */
     @Excel(name = "社团id")
     @Excel(name = "社团id")
     private Long cid;
     private Long cid;

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationSignin.java

 package yangtz.cs.liu.campus.domain.organization;
 package yangtz.cs.liu.campus.domain.organization;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
 import lombok.Data;
 import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
@@ -15,9 +17,6 @@ public class SchoolOrganizationSignin extends OurBaseEntity
 {
 {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    /** $column.columnComment */
-    private Long id;
-
     /** 姓名 */
     /** 姓名 */
     @Excel(name = "姓名")
     @Excel(name = "姓名")
     private String name;
     private String name;

smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/organization/WxSchoolOrganizationController.java

@@ -92,12 +92,12 @@ public class WxSchoolOrganizationController extends BaseController {
      * 通过当前登录人查询当前社团的报名情况
      * 通过当前登录人查询当前社团的报名情况
      * */
      * */
     @GetMapping("/search")
     @GetMapping("/search")
-    public AjaxResult search (@RequestBody WxOrganizationSigninVo vo){
+    public AjaxResult search (WxOrganizationSigninVo vo){
         Long userId = userInfoUtil.getMpLoginUser().getUserId();
         Long userId = userInfoUtil.getMpLoginUser().getUserId();
         //根据当前登录人 查询当前社团的报名状态
         //根据当前登录人 查询当前社团的报名状态
         LambdaQueryWrapper<SchoolOrganizationSignin> wrapper = Wrappers.lambdaQuery();
         LambdaQueryWrapper<SchoolOrganizationSignin> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(SchoolOrganizationSignin::getUserId,userId)
         wrapper.eq(SchoolOrganizationSignin::getUserId,userId)
-                .eq(StringUtils.isNotEmpty(vo.getOrgName()),SchoolOrganizationSignin::getOrgName,vo.getOrgName())
+                .eq(SchoolOrganizationSignin::getCid,vo.getCid())
                 .eq(SchoolOrganizationSignin::getDelFlag,"0");
                 .eq(SchoolOrganizationSignin::getDelFlag,"0");
 
 
         return AjaxResult.success(schoolOrganizationSigninService.getOne(wrapper));
         return AjaxResult.success(schoolOrganizationSigninService.getOne(wrapper));

smart-campus/src/main/java/yangtz/cs/liu/wechat/vo/organization/WxOrganizationSigninVo.java

@@ -10,6 +10,6 @@ import lombok.Data;
 @Data
 @Data
 public class WxOrganizationSigninVo {
 public class WxOrganizationSigninVo {
 
 
-    //社团名称
-    private String orgName;
+    //社团id
+    private Long cid;
 }
 }