Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dd_school
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqi
dd_school
Commits
70476677
Commit
70476677
authored
Sep 08, 2023
by
liuliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
社团管理相关接口权限添加修改
parent
93c370f0
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
20 deletions
+15
-20
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+1
-1
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationActivationRecord.java
+2
-3
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationFc.java
+2
-3
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationInfo.java
+2
-3
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationMember.java
+2
-3
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationSignin.java
+2
-3
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/organization/WxSchoolOrganizationController.java
+2
-2
smart-campus/src/main/java/yangtz/cs/liu/wechat/vo/organization/WxOrganizationSigninVo.java
+2
-2
No files found.
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
View file @
70476677
...
...
@@ -130,7 +130,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.
antMatchers
(
"/wx/user/getToken"
).
permitAll
()
//开发一个接口字典
.
antMatchers
(
"/system/dict/data/type/**"
).
permitAll
()
.
antMatchers
(
"/**"
).
permitAll
()
//
.antMatchers("/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证
.
anyRequest
().
authenticated
()
.
and
()
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationActivationRecord.java
View file @
70476677
...
...
@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.domain.organization;
import
java.util.Date
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.core.domain.OurBaseEntity
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
...
...
@@ -21,9 +23,6 @@ public class SchoolOrganizationActivationRecord extends OurBaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
private
Long
id
;
/** 活动主题 */
@Excel
(
name
=
"活动主题"
)
private
String
theme
;
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationFc.java
View file @
70476677
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
lombok.Data
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
...
...
@@ -18,9 +20,6 @@ public class SchoolOrganizationFc extends OurBaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
private
Long
id
;
/** 对应的社团id */
@Excel
(
name
=
"对应的社团id"
)
private
Long
cid
;
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationInfo.java
View file @
70476677
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
lombok.Data
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
...
...
@@ -17,9 +19,6 @@ import com.ruoyi.common.core.domain.BaseEntity;
public
class
SchoolOrganizationInfo
extends
OurBaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
private
Long
id
;
/** 社团名称 */
@Excel
(
name
=
"社团名称"
)
private
String
name
;
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationMember.java
View file @
70476677
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
lombok.Data
;
import
com.ruoyi.common.annotation.Excel
;
...
...
@@ -15,9 +17,6 @@ public class SchoolOrganizationMember extends OurBaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
private
Long
id
;
/** 社团id */
@Excel
(
name
=
"社团id"
)
private
Long
cid
;
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationSignin.java
View file @
70476677
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
lombok.Data
;
import
com.ruoyi.common.annotation.Excel
;
...
...
@@ -15,9 +17,6 @@ public class SchoolOrganizationSignin extends OurBaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
private
Long
id
;
/** 姓名 */
@Excel
(
name
=
"姓名"
)
private
String
name
;
...
...
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/organization/WxSchoolOrganizationController.java
View file @
70476677
...
...
@@ -92,12 +92,12 @@ public class WxSchoolOrganizationController extends BaseController {
* 通过当前登录人查询当前社团的报名情况
* */
@GetMapping
(
"/search"
)
public
AjaxResult
search
(
@RequestBody
WxOrganizationSigninVo
vo
){
public
AjaxResult
search
(
WxOrganizationSigninVo
vo
){
Long
userId
=
userInfoUtil
.
getMpLoginUser
().
getUserId
();
//根据当前登录人 查询当前社团的报名状态
LambdaQueryWrapper
<
SchoolOrganizationSignin
>
wrapper
=
Wrappers
.
lambdaQuery
();
wrapper
.
eq
(
SchoolOrganizationSignin:
:
getUserId
,
userId
)
.
eq
(
S
tringUtils
.
isNotEmpty
(
vo
.
getOrgName
()),
SchoolOrganizationSignin:
:
getOrgName
,
vo
.
getOrgName
())
.
eq
(
S
choolOrganizationSignin:
:
getCid
,
vo
.
getCid
())
.
eq
(
SchoolOrganizationSignin:
:
getDelFlag
,
"0"
);
return
AjaxResult
.
success
(
schoolOrganizationSigninService
.
getOne
(
wrapper
));
...
...
smart-campus/src/main/java/yangtz/cs/liu/wechat/vo/organization/WxOrganizationSigninVo.java
View file @
70476677
...
...
@@ -10,6 +10,6 @@ import lombok.Data;
@Data
public
class
WxOrganizationSigninVo
{
//社团
名称
private
String
orgName
;
//社团
id
private
Long
cid
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment