andy 1 жил өмнө
parent
commit
c723aaa6a2

+ 2 - 2
src/main/java/com/scbfkj/uni/library/script/AuthorizationScriptUtil.java

@@ -126,13 +126,13 @@ public class AuthorizationScriptUtil {
         List<Map<String, Object>> results;
         if (value.get("type").toString().equals("2")) {
             results = DataBase.query(DatabaseScriptUtil.queryConnectionStr(datasourceId), """
-                    select distinct pageconfiguration.*
+                    select distinct pageconfiguration.*,selectcolumnlist
                     from usergrouppermissions
                              right join pageconfiguration on pageconfiguration.pageconfigurationid = usergrouppermissions.pageconfigurationid
                     where usergroupid = ?""", id);
         } else {
             results = DataBase.query(DatabaseScriptUtil.queryConnectionStr(datasourceId), """
-                    select  distinct pageconfiguration.*
+                    select  distinct pageconfiguration.*,selectcolumnlist
                     from userpermissions
                         right join pageconfiguration on pageconfiguration.pageconfigurationid = userpermissions.pageconfigurationid  
                     where userid =?""", id);

+ 3 - 0
src/main/java/com/scbfkj/uni/service/LoggerService.java

@@ -128,6 +128,9 @@ public class LoggerService {
                             String connectionStr = config.get("connectset").toString();
                             String expression = value1.get(0).get("expression").toString();
                             List<Object> parameters = new ArrayList<>();
+                            if (connectionStr.contains("jdbc:")) {
+                                type = "DB";
+                            }
 
                             switch (type.toUpperCase()) {
                                 case "ES", "KAFKA" -> {