From 8ecdbbe376a0ecdc2e86aba97a31ccd65ff5f660 Mon Sep 17 00:00:00 2001
From: admin <1752476835@qq.com>
Date: Tue, 27 Aug 2024 09:49:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BA=97=E5=91=98=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BF=A1=E6=81=AF=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlayClerkUserInfoServiceImpl.java    | 24 +++++++--------
 .../weichat/controller/WxClerkController.java | 30 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

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 0b216c7..3864c7a 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,18 +139,18 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
     @Override
     public PlayClerkUserLoginResponseVo getVo(PlayClerkUserInfoEntity userInfo) {
         PlayClerkUserLoginResponseVo result = ConvertUtil.entityToVo(userInfo, PlayClerkUserLoginResponseVo.class);
-        List<PlayClerkDataReviewInfoEntity> list = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(),"0");
-        // 判断头像、音频、相册是否可以编辑，如果存在未审核的数据，则不允许编辑
-        Map<String, PlayClerkDataReviewInfoEntity> 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.setAlbumAllowEdit(false);
-        }
-        if (map.containsKey("3")) {
-            result.setAudioAllowEdit(false);
-        }
+//        List<PlayClerkDataReviewInfoEntity> list = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(),"0");
+//        // 判断头像、音频、相册是否可以编辑，如果存在未审核的数据，则不允许编辑
+//        Map<String, PlayClerkDataReviewInfoEntity> 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.setAlbumAllowEdit(false);
+//        }
+//        if (map.containsKey("3")) {
+//            result.setAudioAllowEdit(false);
+//        }
         // 是店员之后，判断是否可以登录
         if ("1".equals(result.getClerkState())) {
             // 设置店员是否运行登录
diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java
index 4328e2a..df7f0ba 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java
@@ -222,11 +222,11 @@ public class WxClerkController {
     @PostMapping("/user/updateAvatar")
     public R updateAvatar(@Validated @RequestBody PlayClerkUserAvatarVo vo) {
         PlayClerkUserInfoEntity userInfo = ThreadLocalRequestDetail.getClerkUserInfo();
-        PlayClerkDataReviewInfoEntity entity = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "1", "0");
-        if (entity != null) {
-            throw new CustomException("已有申请未审核");
-        }
-        entity = new PlayClerkDataReviewInfoEntity();
+//        PlayClerkDataReviewInfoEntity entity = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "1", "0");
+//        if (entity != null) {
+//            throw new CustomException("已有申请未审核");
+//        }
+        PlayClerkDataReviewInfoEntity entity = new PlayClerkDataReviewInfoEntity();
         entity.setClerkId(userInfo.getId());
         entity.setDataType("1");
         entity.setReviewState("0");
@@ -241,11 +241,11 @@ public class WxClerkController {
     @PostMapping("/user/updateAlbum")
     public R updateAlbum(@Validated @RequestBody PlayClerkUserAlbumVo vo) {
         PlayClerkUserInfoEntity userInfo = ThreadLocalRequestDetail.getClerkUserInfo();
-        PlayClerkDataReviewInfoEntity entity = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "2", "0");
-        if (entity != null) {
-            throw new CustomException("已有申请未审核");
-        }
-        entity = new PlayClerkDataReviewInfoEntity();
+//        PlayClerkDataReviewInfoEntity entity = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "2", "0");
+//        if (entity != null) {
+//            throw new CustomException("已有申请未审核");
+//        }
+        PlayClerkDataReviewInfoEntity entity = new PlayClerkDataReviewInfoEntity();
         entity.setClerkId(userInfo.getId());
         entity.setDataType("2");
         entity.setReviewState("0");
@@ -258,11 +258,11 @@ public class WxClerkController {
     @PostMapping("/user/updateAudio")
     public R updateAudio(@Validated @RequestBody PlayClerkUserAudioVo vo) {
         PlayClerkUserInfoEntity userInfo = ThreadLocalRequestDetail.getClerkUserInfo();
-        PlayClerkDataReviewInfoEntity entity = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "3", "0");
-        if (entity != null) {
-            throw new CustomException("已有申请未审核");
-        }
-        entity = new PlayClerkDataReviewInfoEntity();
+//        PlayClerkDataReviewInfoEntity entity = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "3", "0");
+//        if (entity != null) {
+//            throw new CustomException("已有申请未审核");
+//        }
+        PlayClerkDataReviewInfoEntity entity = new PlayClerkDataReviewInfoEntity();
         entity.setClerkId(userInfo.getId());
         entity.setDataType("3");
         entity.setReviewState("0");