From ae79956dcf9edd1e54bfa2485aa68bb5991129b8 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 31 Mar 2025 16:06:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=AD=A3=E5=85=83=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wallet/api/dto/rule/WalletRuleJoinDto.java   | 16 +++++++++++++---
 .../rule/WalletRuleJoinController.java           |  4 ++--
 .../impl/thrid/WalletThirdZyServiceImpl.java     |  7 +++++--
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/rule/WalletRuleJoinDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/rule/WalletRuleJoinDto.java
index 5d9f6f7b2..d6e9159b1 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/rule/WalletRuleJoinDto.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/rule/WalletRuleJoinDto.java
@@ -1,14 +1,24 @@
 package com.bsd.pjcloud.wallet.api.dto.rule;
 
 import com.bsd.pjcloud.wallet.api.entity.rule.WalletRuleJoinEntity;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
-//@Builder
-//@AllArgsConstructor
-//@NoArgsConstructor
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class WalletRuleJoinDto extends WalletRuleJoinEntity {
+
+    /**
+     * 部门数组
+     */
+    @NotEmpty(message = "部门数组不能为空")
+    private List<@NotEmpty Long> targetDeptIdList;
+
 }
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/rule/WalletRuleJoinController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/rule/WalletRuleJoinController.java
index f1869c4ee..6298c7ca8 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/rule/WalletRuleJoinController.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/rule/WalletRuleJoinController.java
@@ -69,8 +69,8 @@ public class WalletRuleJoinController {
     @SysLog("新增钱包规则配置")
     @PostMapping
     // @PreAuthorize("@pms.hasPermission('wallet_walletRuleJoin_add')")
-    public R save(@RequestBody WalletRuleJoinEntity walletRuleJoin) {
-        return R.ok(walletRuleJoinService.create(walletRuleJoin));
+    public R save(@RequestBody WalletRuleJoinDto dto) {
+        return R.ok(walletRuleJoinService.create(dto));
     }
 
     @Operation(summary = "修改钱包规则配置", description = "修改钱包规则配置")
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java
index 0cfb057e9..bacd82b61 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java
@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.admin.api.dto.DeptAllListDto;
 import com.bsd.pjcloud.admin.api.dto.UserDTO;
+import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.entity.SysDept;
 import com.bsd.pjcloud.admin.api.entity.SysRole;
 import com.bsd.pjcloud.admin.api.feign.RemoteDeptService;
@@ -252,7 +253,9 @@ public class WalletThirdZyServiceImpl implements WalletThirdZyService {
         List<ZyMerSyncAccountInfoDto> syncList = new ArrayList<>();
         String syncAllMchVersion = getSyncAllMchVersion();
         for (UserVO v : userVOList) {
-            if (ObjectUtil.isEmpty(v) || ObjectUtil.isEmpty(v.getUserId())) {
+            // 查询用户手机号
+            UserInfo userInfo = remoteUserService.getByUserId(v.getUserId()).getData();
+            if (ObjectUtil.isEmpty(userInfo)) {
                 log.error("|{}|syncAllUserGroup用户不存在WalletManageVo|{}|", TAG, JSONUtil.toJsonStr(v));
                 continue;
             }
@@ -292,7 +295,7 @@ public class WalletThirdZyServiceImpl implements WalletThirdZyService {
             item.setEPID(v.getDeptId().toString());
             item.setPerCode(v.getUserId().toString());
             item.setAccClassID(roleId.toString());
-            item.setPhoneNo(v.getPhone());
+            item.setPhoneNo(userInfo.getSysUser().getPhone());
             item.setFixId(syncAllMchVersion);
             syncList.add(item);
         }