Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
5ffb9ded
Commit
5ffb9ded
authored
Dec 09, 2020
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
6edbc700
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
AdminUserRelationController.java
...ecurity/admin/rest/admin/AdminUserRelationController.java
+16
-0
AppUserRelationMapper.xml
...admin/src/main/resources/mapper/AppUserRelationMapper.xml
+2
-2
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AdminUserRelationController.java
View file @
5ffb9ded
...
@@ -39,4 +39,20 @@ AdminUserRelationController extends BaseController<AppUserRelationBiz,AppUserRel
...
@@ -39,4 +39,20 @@ AdminUserRelationController extends BaseController<AppUserRelationBiz,AppUserRel
public
ObjectRestResponse
<
InviteMemberVo
>
findInviteMemberByActivitState
(
AppUserRelationDTO
userRelationDTO
)
{
public
ObjectRestResponse
<
InviteMemberVo
>
findInviteMemberByActivitState
(
AppUserRelationDTO
userRelationDTO
)
{
return
ObjectRestResponse
.
succ
(
baseBiz
.
selectList
(
userRelationDTO
));
return
ObjectRestResponse
.
succ
(
baseBiz
.
selectList
(
userRelationDTO
));
}
}
@RequestMapping
(
value
=
"unBind"
,
method
=
RequestMethod
.
POST
)
@ApiModelProperty
(
"后台解绑"
)
public
ObjectRestResponse
unBind
(
@RequestBody
AppUserRelation
appUserRelation
){
AppUserRelation
appUserRelation1
=
baseBiz
.
selectById
(
appUserRelation
.
getId
());
if
(
appUserRelation1
!=
null
)
appUserRelation
.
setUserId
(
appUserRelation1
.
getUserId
());
appUserRelation
.
setParentId
(
0
);
appUserRelation
.
setBindTime
(
0L
);
appUserRelation
.
setIsForever
(
0
);
baseBiz
.
updRelation
(
appUserRelation
);
return
ObjectRestResponse
.
succ
();
}
}
}
\ No newline at end of file
ace-modules/ace-admin/src/main/resources/mapper/AppUserRelationMapper.xml
View file @
5ffb9ded
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
and ( d.nickname like concat('%',#{name},'%') or d.realname like concat('%',#{name},'%') )
and ( d.nickname like concat('%',#{name},'%') or d.realname like concat('%',#{name},'%') )
</if>
</if>
</where>
</where>
group c
.user_id
GROUP BY r
.user_id
order by
c
.bind_time desc
order by
r
.bind_time desc
</select>
</select>
</mapper>
</mapper>
\ No newline at end of file
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