11

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java

@@ -217,7 +217,7 @@ public class SysUserController {
             userDTO.setIsFindCheckUser(true);
         }
         Page pageParams = new Page();
-        pageParams.setCurrent(1);
+        pageParams.setCurrent(current);
         pageParams.setSize(size);
         return R.ok(userService.getUsersWithRolePage(pageParams, userDTO).getRecords());
     }

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java

@@ -3,6 +3,7 @@ package com.bsd.pjcloud.wallet.service.impl.thrid;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSON;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -242,7 +243,9 @@ public class WalletThirdZyServiceImpl implements WalletThirdZyService {
             query.setDeptIds(syncZyDeptIds);
         }
         List<UserVO> userVOList = remoteUserService.getRemoteUserPage(page.getCurrent(), page.getSize(), query).getData();
+        log.info("|{}|getRemoteUserPage,params|{}|page|{}|size:|{}|", TAG, JSONUtil.toJsonStr(query), page.getCurrent(), page.getSize());
         if (ObjectUtil.isEmpty(userVOList)) return 0;
+        log.info("|{}|getRemoteUserPage,数据length|{}|", TAG, userVOList.size());
         List<ZyMerSyncAccountInfoDto> syncList = new ArrayList<>();
         String syncAllMchVersion = getSyncAllMchVersion();
         for (UserVO v : userVOList) {
@@ -264,7 +267,7 @@ public class WalletThirdZyServiceImpl implements WalletThirdZyService {
                 }
             }
             ZyMerSyncAccountInfoDto item = new ZyMerSyncAccountInfoDto();
-            item.setAccName(v.getUsername());
+            item.setAccName(v.getName());
             item.setAccNum(v.getUserId().toString());
             item.setCardAccNum(userWallet.getId());
             item.setCardSID(userWallet.getCardNumber());