|
@@ -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);
|