moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公会-后台-查询-邀请人id

Browse Source
This commit is contained in:
khalil
2025-07-21 10:49:25 +08:00
parent 9560cfc90d
commit 9cedb0f543
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java
View File

@@ -277,7 +277,7 @@ public class GuildManageAdminService {
public Page<GuildAdminVo> pageGuild(int partitionId, Integer regionId,
Integer guildId, Long erbanNo,
String startTime, String endTime,
long pageNum, long pageSize) {
Long inviteErbanNo, long pageNum, long pageSize) {
Page<GuildAdminVo> voPage = new Page<>(pageNum, pageSize);
Set<Integer> regionGuildIdSet = new HashSet<>();
@@ -319,6 +319,14 @@ public class GuildManageAdminService {
queryWrapper.le(Guild::getCreateTime, eTime);
}
if (null != inviteErbanNo){
Users inviteUser = usersService.getUserByErbanNo(inviteErbanNo);
if (null == inviteUser || inviteUser.getPartitionId() != partitionId){
return voPage;
}
queryWrapper.eq(Guild::getInviteUid, inviteUser.getUid());
}
Page<Guild> page = new Page<>(pageNum, pageSize);
guildService.page(page, queryWrapper);
if (page.getRecords().isEmpty()){

7
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildManageAdminController.java
View File

@@ -94,6 +94,7 @@ public class GuildManageAdminController extends BaseController {
@ApiImplicitParam(name = "erbanNo", value = "会长erbanNo"),
@ApiImplicitParam(name = "startTime", value = "开始时间"),
@ApiImplicitParam(name = "endTime", value = "结束时间"),
@ApiImplicitParam(name = "inviteErbanNo", value = "邀请用户id"),
@ApiImplicitParam(name = "pageNum", value = "页码", required = true),
@ApiImplicitParam(name = "pageSize", value = "页长", required = true)
})
@@ -103,8 +104,9 @@ public class GuildManageAdminController extends BaseController {
Integer guildId,
Long erbanNo,
String startTime, String endTime,
Long inviteErbanNo,
long pageNum, long pageSize){
Page<GuildAdminVo> page = service.pageGuild(partitionId, regionId, guildId, erbanNo, startTime, endTime, pageNum, pageSize);
Page<GuildAdminVo> page = service.pageGuild(partitionId, regionId, guildId, erbanNo, startTime, endTime, inviteErbanNo, pageNum, pageSize);
return BusiResult.success(new PageResult<>(page));
}
@@ -124,8 +126,9 @@ public class GuildManageAdminController extends BaseController {
Integer regionId,
Integer guildId,
Long erbanNo,
Long inviteErbanNo,
String startTime, String endTime){
Page<GuildAdminVo> pageInfo = service.pageGuild(partitionId, regionId, guildId, erbanNo,startTime, endTime, 0, -1);
Page<GuildAdminVo> pageInfo = service.pageGuild(partitionId, regionId, guildId, erbanNo,startTime, endTime, inviteErbanNo, 0, -1);
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
// 这里URLEncoder.encode可以防止中文乱码