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

后台-公会申请-根据后台用户拥有分区去查询

Browse Source
This commit is contained in:
khalil
2025-07-21 14:26:01 +08:00
parent 51c4db8710
commit 21a5860d11
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildApplyAdminService.java
View File

@@ -2,6 +2,7 @@ package com.accompany.admin.service.guild;
import cn.hutool.core.date.DateUtil;
import com.accompany.admin.model.AdminUser;
import com.accompany.admin.service.system.AdminPartitionService;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.vo.guild.GuildApplyAuditVo;
import com.accompany.business.model.give.GiveUser;
@@ -57,6 +58,8 @@ public class GuildApplyAdminService {
private GiveUserService giveUserService;
@Autowired
private GuildService guildService;
@Autowired
private AdminPartitionService adminPartitionService;
public void existNotAuditByApplyUidCheck4Admin(Long applyUid, String erbanNo) {
GuildApply existNotAuditByApplyUid = guildApplyService.getExistNotAuditByApplyUid(applyUid);
@@ -70,11 +73,16 @@ public class GuildApplyAdminService {
}
}
public BusiResult<PageResult<GuildApplyAuditVo>> auditList(String startTimeStr, String endTimeStr, Long erbanNo, Byte auditStatus,
Integer partitionId,Integer pageNo, Integer pageSize, Long inviteUid) {
if (partitionId == null) {
throw new AdminServiceException("请选择分区");
public BusiResult<PageResult<GuildApplyAuditVo>> auditList(int adminId, String startTimeStr, String endTimeStr, Long erbanNo, Byte auditStatus,
Integer partitionId, Integer pageNo, Integer pageSize, Long inviteUid) {
List<Integer> partitionIdList = adminPartitionService.getAllPartitionId(adminId);
if (CollectionUtils.isEmpty(partitionIdList)){
throw new AdminServiceException(BusiStatus.PARTITION_ERROR);
}
if (null != partitionId && !partitionIdList.contains(partitionId)){
throw new AdminServiceException(BusiStatus.PARTITION_ERROR);
}
Date startDate = null, endDate = null;
Long uid = null;
if (StringUtils.isNotEmpty(startTimeStr)) {
@@ -102,6 +110,8 @@ public class GuildApplyAdminService {
}
if (partitionId != null) {
queryWrapper.eq(GuildApply::getPartitionId, partitionId);
} else {
queryWrapper.in(GuildApply::getPartitionId, partitionIdList);
}
if (inviteUid != null) {
queryWrapper.eq(GuildApply::getInviteUid, inviteUid);

6
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildSuperAdminService.java
View File

@@ -250,11 +250,11 @@ public class GuildSuperAdminService {
GuildSuperAdminInfo byAdminId = guildSuperAdminInfoService.getByAdminId(adminId);
Long inviteUid = Optional.ofNullable(byAdminId)
.map(x -> x.getUid()).orElse(null);
.map(GuildSuperAdminInfo::getUid).orElse(null);
if (inviteUid == null) {
return BusiResult.success(new PageResult<>());
}
return guildApplyAdminService.auditList(startTimeStr, endTimeStr, erbanNo, auditStatus, null, pageNo, pageSize, inviteUid);
return guildApplyAdminService.auditList(adminId, startTimeStr, endTimeStr, erbanNo, auditStatus, null, pageNo, pageSize, inviteUid);
}
@@ -262,7 +262,7 @@ public class GuildSuperAdminService {
Integer adminId, Integer guildId, Long ownerErbanNo, Integer pageNo, Integer pageSize) {
GuildSuperAdminInfo byAdminId = guildSuperAdminInfoService.getByAdminId(adminId);
Long inviteUid = Optional.ofNullable(byAdminId)
.map(x -> x.getUid()).orElse(null);
.map(GuildSuperAdminInfo::getUid).orElse(null);
if (inviteUid == null) {
return new Page<>();
}

3
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildApplyAdminController.java
View File

@@ -31,7 +31,8 @@ public class GuildApplyAdminController extends BaseController {
@ApiOperation(value = "审核列表", httpMethod = "GET")
@GetMapping("/list")
public BusiResult<PageResult<GuildApplyAuditVo>> auditList(BasePageParams basePageParams, Long erbanNo, Byte auditStatus) {
return guildApplyAdminService.auditList(basePageParams.getStartTime(), basePageParams.getEndTime(), erbanNo, auditStatus,
int adminId = getAdminId();
return guildApplyAdminService.auditList(adminId, basePageParams.getStartTime(), basePageParams.getEndTime(), erbanNo, auditStatus,
basePageParams.getPartitionId(), basePageParams.getPageNo(), basePageParams.getPageSize(), null);
}