Merge branch 'develop' of gitadmin/tuoheng_oidc into release

tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/ClientUserServiceImpl.java

@@ -261,29 +261,25 @@ public class ClientUserServiceImpl implements ClientUserSevice {
         IPage<TenantPo> pageData = tenantMapper.findList(page, query);
         pageData.convert(x -> {
             TenantVo vo = Convert.convert(TenantVo.class, x);
-            if (ObjectUtil.isNotEmpty(vo.getCode())) {
-                Long userId = x.getUserId();
-                List<AuthoritiesPo> poList = authoritiesMapper.selectByUserId(userId);
-                UserPo userPo = clientUserMapper.selectByUserId(userId);
-                if (null != userPo) {
-                    vo.setUsername(userPo.getUsername());
-                }
-                List<BusinessSystemVo> businessSystemVoList = new ArrayList<>();
-                for (AuthoritiesPo authoritiesPo : poList) {
-                    BusinessSystemVo businessSystemVo = new BusinessSystemVo();
-                    //TODO 后期维护各个业务平台
-                    if (authoritiesPo.getAuthority().contains("hhz")) {
-                        businessSystemVo.setClientId(HhzUrlConstant.HHZ_CLIENT);
-                        businessSystemVo.setName(HhzUrlConstant.HHZ_NAME);
-                        businessSystemVoList.add(businessSystemVo);
-                    }
+            Long userId = x.getUserId();
+            List<AuthoritiesPo> poList = authoritiesMapper.selectByUserId(userId);
+            UserPo userPo = clientUserMapper.selectByUserId(userId);
+            if (null != userPo) {
+                vo.setUsername(userPo.getUsername());
+            }
+            List<BusinessSystemVo> businessSystemVoList = new ArrayList<>();
+            for (AuthoritiesPo authoritiesPo : poList) {
+                BusinessSystemVo businessSystemVo = new BusinessSystemVo();
+                //TODO 后期维护各个业务平台
+                if (authoritiesPo.getAuthority().contains("hhz")) {
+                    businessSystemVo.setClientId(HhzUrlConstant.HHZ_CLIENT);
+                    businessSystemVo.setName(HhzUrlConstant.HHZ_NAME);
+                    businessSystemVoList.add(businessSystemVo);
                 }
-                businessSystemVoList = businessSystemVoList.stream().distinct().collect(Collectors.toList());
-                vo.setList(businessSystemVoList);
-                return vo;
-            } else {
-                return null;
             }
+            businessSystemVoList = businessSystemVoList.stream().distinct().collect(Collectors.toList());
+            vo.setList(businessSystemVoList);
+            return vo;
         });
         return JsonResult.success(pageData);
     }