zhouxianguang 6 роки тому
батько
коміт
f97a200952

+ 2 - 0
rankin-data-api/src/main/java/cn/rankin/data/api/auth/dto/AuthQueryDTO.java

@@ -23,4 +23,6 @@ public class AuthQueryDTO implements Serializable {
     private Integer pageSize = 10;
 
     private Integer fastExpired = 0;
+
+    private String uids;
 }

+ 13 - 3
rankin-user-service/src/main/java/cn/rankin/userservice/controller/TerminalUserController.java

@@ -83,7 +83,7 @@ public class TerminalUserController
         }
 
         String merchantId = terminalUserSearchDTO.getMerchantId();
-        log.info("merchantId:"+merchantId);
+        log.info("merchantId:" + merchantId);
         if (!StringUtils.isEmpty(merchantId))
         {
             terminalUser.setMerchantId(merchantId);
@@ -171,7 +171,7 @@ public class TerminalUserController
         }
 
         String merchantId = terminalUserSearchDTO.getMerchantId();
-        log.info("merchantId:"+merchantId);
+        log.info("merchantId:" + merchantId);
         if (!StringUtils.isEmpty(merchantId))
         {
             log.info("/user/auth/list | request merchantId={}", merchantId);
@@ -194,6 +194,16 @@ public class TerminalUserController
             TerminalUser user = terminalUserList.get(0);
             authQueryDTO.setUid(user.getId());
         }
+        else
+        {
+            String uids = "";
+            for (TerminalUser obj : terminalUserList)
+            {
+                uids += obj.getId()+"#";
+            }
+            uids = uids.substring(0,uids.length()-1);
+            authQueryDTO.setUids(uids);
+        }
 
         Page<AuthVo> authPage = remoteAuthProxy.findAuthList(authQueryDTO);
 
@@ -210,7 +220,7 @@ public class TerminalUserController
         authList.forEach(authVo ->
         {
             TerminalUser termianlUser = terminalUserMap.get(authVo.getUid());
-            if(termianlUser!=null)
+            if (termianlUser != null)
             {
                 TerminalUserAuthVo vo = Converter.getTerminalUserAuthVo(termianlUser, authVo);
                 terminalUserAuthVos.add(vo);