diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkDataReviewInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkDataReviewInfoService.java index c848f41..bfc3c30 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkDataReviewInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkDataReviewInfoService.java @@ -23,7 +23,14 @@ public interface IPlayClerkDataReviewInfoService extends IService queryByClerkId(String clerkId); + /** + * 查询店员资料申请 + * + * @param clerkId 店员ID + * @param reviewState 审核状态(0:未审核:1:审核通过,2:审核不通过) + * @return PlayClerkDataReviewInfoEntity + */ + List queryByClerkId(String clerkId, String reviewState); /** * 查询店员资料申请 diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkDataReviewInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkDataReviewInfoServiceImpl.java index 40f03ee..a510804 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkDataReviewInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkDataReviewInfoServiceImpl.java @@ -57,9 +57,10 @@ public class PlayClerkDataReviewInfoServiceImpl extends ServiceImpl queryByClerkId(String clerkId) { + public List queryByClerkId(String clerkId,String reviewState) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PlayClerkDataReviewInfoEntity::getClerkId, clerkId); + queryWrapper.eq(PlayClerkDataReviewInfoEntity::getReviewState, reviewState); return this.baseMapper.selectList(queryWrapper); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java index afd0a04..0b216c7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java @@ -139,14 +139,14 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl list = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId()); + List list = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(),"0"); // 判断头像、音频、相册是否可以编辑,如果存在未审核的数据,则不允许编辑 Map map = list.stream().collect(Collectors.toMap(PlayClerkDataReviewInfoEntity::getDataType, account -> account, (entity1, entity2) -> entity1)); if (map.containsKey("1")) { result.setAvatarAllowEdit(false); } if (map.containsKey("2")) { - result.setAvatarAllowEdit(false); + result.setAlbumAllowEdit(false); } if (map.containsKey("3")) { result.setAudioAllowEdit(false); diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCommodityInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCommodityInfoServiceImpl.java index f44fc07..9e20761 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCommodityInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCommodityInfoServiceImpl.java @@ -70,6 +70,7 @@ public class PlayCommodityInfoServiceImpl extends ServiceImpl selectTree() { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); lambdaQueryWrapper.selectAll(PlayCommodityInfoEntity.class); + lambdaQueryWrapper.orderByDesc(PlayCommodityInfoEntity::getSort); List list = this.baseMapper.selectJoinList(PlayCommodityInfoEntity.class, lambdaQueryWrapper); Map> collect = list.stream().filter(a -> a != null && a.getId() != null).collect(Collectors.groupingBy(PlayCommodityInfoEntity::getPId)); return this.assembleTree(collect, collect.get("00")); @@ -137,6 +138,7 @@ public class PlayCommodityInfoServiceImpl extends ServiceImpl selectByPId(String pId) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PlayCommodityInfoEntity::getPId, pId); + lambdaQueryWrapper.orderByDesc(PlayCommodityInfoEntity::getSort); return this.baseMapper.selectList(lambdaQueryWrapper); }