chore: 调整获取总用户信息

kicc-auth/src/main/java/com/cloud/kicc/auth/config/AuthorizationServerConfiguration.java

@@ -2,6 +2,7 @@ package com.cloud.kicc.auth.config;
 
 import com.cloud.kicc.common.core.constant.SecurityConstants;
 import com.cloud.kicc.common.data.entity.CasUser;
+import com.cloud.kicc.common.data.entity.KiccUser;
 import com.cloud.kicc.common.security.grant.app.ResourceOwnerCustomeAppTokenGranter;
 import com.cloud.kicc.common.security.override.KiccClientDetailsService;
 import com.cloud.kicc.common.security.override.KiccCustomTokenServices;
@@ -103,8 +104,8 @@ public class AuthorizationServerConfiguration extends AuthorizationServerConfigu
 				return accessToken;
 			}
 
-			CasUser casUser = (CasUser) authentication.getUserAuthentication().getPrincipal();
+			KiccUser kiccUser = (KiccUser) authentication.getUserAuthentication().getPrincipal();
-			additionalInfo.put(SecurityConstants.DETAILS_USER, casUser);
+			additionalInfo.put(SecurityConstants.DETAILS_USER, kiccUser);
 			((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInfo);
 			return accessToken;
 		};

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualDbServiceImpl.java

@@ -57,14 +57,9 @@ public class VisualDbServiceImpl extends ServiceImpl<VisualDbMapper, VisualDb> i
 			BeanUtils.copyProperties(visualDb, dynamicDataSource);
 			DynamicDataSourceUtil.switchToDataSource(dynamicDataSource);
 			// 获取user信息
-			CasUser casUser = SecurityUtils.getCasUser();
 			KiccUser kiccUser = SecurityUtils.getUser();
 			// 获取user参数
-			Map<String, Object> map = MapUtil.newHashMap();
+			Map<String, Object> map = ObjectUtil.isEmpty(kiccUser) ? MapUtil.newHashMap() : BeanUtil.beanToMap(kiccUser);
-			if (ObjectUtil.isNotEmpty(casUser)) {
-				map.putAll(BeanUtil.beanToMap(casUser));
-				map.putAll(BeanUtil.beanToMap(kiccUser));
-			}
 			// 替换user占位符
 			String dynamicSql = PlaceholderUtil.getDefaultResolver().resolveByMap(sql, map);
 			// 执行自定义sql