From 770df7062f447b7ad3e7b45bb984ee3fdd40cd99 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 9 Jan 2025 14:00:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B6=85=E5=B8=82spu?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SupermarketSpuController.java   |  1 +
 .../controller/ThirdPartyOAth2Cotroller.java   | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java
index e4ae80dca..18d30e4c6 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java
@@ -194,6 +194,7 @@ public class SupermarketSpuController {
     public R getSupermarketSpu(@RequestBody SupermarketSpuAppQueryDTO supermarketSpuQueryDTO,@ParameterObject Page page) {
         LambdaQueryWrapper<SupermarketSpuEntity>  wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(supermarketSpuQueryDTO.getMerchantId() != null, SupermarketSpuEntity::getMerchantId, supermarketSpuQueryDTO.getMerchantId());
+        wrapper.eq(supermarketSpuQueryDTO.getCategoryId() != null, SupermarketSpuEntity::getCategoryId, supermarketSpuQueryDTO.getCategoryId());
 //        wrapper.eq(StrUtil.isNotBlank(supermarketSpuQueryDTO.getProductCode()), SupermarketSpuEntity::getProductCode, supermarketSpuQueryDTO.getProductCode());
 //        wrapper.eq(StrUtil.isNotBlank(supermarketSpuQueryDTO.getBarcode()), SupermarketSpuEntity::getBarcode, supermarketSpuQueryDTO.getBarcode());
         wrapper.like(StrUtil.isNotBlank(supermarketSpuQueryDTO.getProductName()), SupermarketSpuEntity::getProductName, supermarketSpuQueryDTO.getProductName());
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java
index d9ab19cf1..6cbc6c569 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java
@@ -67,7 +67,7 @@ public class ThirdPartyOAth2Cotroller {
      */
     @GetMapping("/zzdsso/{token}")
     @Operation(summary = "浙政钉单点登录")
-    @Inner
+    @Inner(value = false)
     @GlobalTransactional
     @Transactional(rollbackFor = Exception.class)
     public R zzdsso(@PathVariable(name = "token") String token) {
@@ -160,7 +160,13 @@ public class ThirdPartyOAth2Cotroller {
         UserTokenDTO userTokenDTO = new UserTokenDTO();
         userTokenDTO.setSysUser(sysUser);
         //登录成功,根据新注册的用户信息返回token
-        return  remoteTokenService.generateToken(userTokenDTO);
+        R<Map> r = remoteTokenService.generateToken(userTokenDTO);
+        HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+        Object accessToken = r.getData().get("accessToken");
+        Object refreshToken = r.getData().get("refreshToken");
+        objectObjectHashMap.put("refreshToken",refreshToken);
+        objectObjectHashMap.put("accessToken",accessToken);
+        return R.ok(objectObjectHashMap);
     }
 
 
@@ -184,7 +190,13 @@ public class ThirdPartyOAth2Cotroller {
             //登录成功生成token
             UserTokenDTO userTokenDTO = new UserTokenDTO();
             userTokenDTO.setSysUser(sysUsers.get(0));
-            remoteTokenService.generateToken(userTokenDTO);
+            R<Map> r = remoteTokenService.generateToken(userTokenDTO);
+            HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+            Object accessToken = r.getData().get("accessToken");
+            Object refreshToken = r.getData().get("refreshToken");
+            objectObjectHashMap.put("refreshToken",refreshToken);
+            objectObjectHashMap.put("accessToken",accessToken);
+            return R.ok(objectObjectHashMap);
         }
 //		log.info("用户不存在，尝试创建用户");
 //		CreateUserDto createUserDto = new CreateUserDto();