From f314e960ae3d101a732bea14af9561a573fcbc0b Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Tue, 15 Mar 2022 17:49:21 +0800
Subject: [PATCH] 20220315

---
 .../java/com/ccsens/cloudutil/aspect/MustLoginAspect.java   | 2 +-
 .../com/ccsens/cloudutil/feign/PtosTallFeignClient.java     | 6 ++++--
 .../java/com/ccsens/ptos_tall/service/WxUserService.java    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java b/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java
index ccafd7e..e25022d 100644
--- a/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java
+++ b/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java
@@ -120,7 +120,7 @@ public class MustLoginAspect {
         Object result = pjp.proceed();
         if(result instanceof JsonResponse && authHeader == null){
             JsonResponse result1 = (JsonResponse) result;
-            if(result1.getCode() == 200 && result1.getData() != null){
+            if(result1.getCode() == 200){
                 result1.setTokenObj(token,refreshToken);
                 return result1;
             }
diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/PtosTallFeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/PtosTallFeignClient.java
index 2af1230..a2079ce 100644
--- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/PtosTallFeignClient.java
+++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/PtosTallFeignClient.java
@@ -12,6 +12,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
 
@@ -24,13 +26,13 @@ public interface PtosTallFeignClient {
     /**
      * 根据token获取userId
      */
-    @GetMapping("users/token")
+    @PostMapping("users/token")
     JsonResponse<FeignUserVo.TokenToUserId> getUserIdByToken(FeignUserDto.UserInfoByToken params);
 
     /**
      * 根据手机号获取用户在本域的业务项目列表
      */
-    @GetMapping("project/byPhone")
+    @PostMapping("project/byPhone")
     JsonResponse<List<FeignProjectVo.ProjectInfo>> queryProjectByPhone(FeignProjectDto.QueryProjectByPhone params);
 
 }
diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/WxUserService.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/WxUserService.java
index c608b0c..fb203d0 100644
--- a/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/WxUserService.java
+++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/WxUserService.java
@@ -169,7 +169,7 @@ public class WxUserService implements IWxUserService {
         List<WxOfficialUser> wxOfficialUsers = wxOfficialUserMapper.selectByExample(wxOfficialUserExample);
         if(CollectionUtil.isNotEmpty(wxOfficialUsers)){
             userOfficial.setUserId(wxOfficialUsers.get(0).getUserId());
-            userOfficial.setStatus(wxOfficialUsers.get(0).getRecStatus());
+            userOfficial.setStatus(wxOfficialUsers.get(0).getAttentionStatus());
         }
         return userOfficial;
     }