Merge remote-tracking branch 'origin/ejs-20230602' into ejs-20230602

gjjs-bd-mybatis-support/src/main/java/com/brilliance/mda/support/mybatis/MyBatisDaoSession.java

@@ -225,6 +225,16 @@ public class MyBatisDaoSession extends AbstractDaoSession implements IDaoSession
     }
 
     @Override
+    public List<String> dbColumnNames() {
+        if (resultLocal.get().hasNext()){
+            Map<String, Object> map = resultLocal.get().next();
+            List<String> columnNames = new ArrayList<>(map.keySet());
+            return columnNames;
+        }
+        return null;
+    }
+
+    @Override
     public <T extends IModule> int dbReadset(IModuleList<T> list, String whereSql, Object[] objects) {
         String moduleDB = MdaUtils.getModuleListDB(list);
         DynamicDataSourceContextHolder.setDataSourceType(moduleDB);

gjjs-bd-runtime/src/main/java/com/brilliance/mda/runtime/mda/IContext.java

@@ -3,6 +3,7 @@ package com.brilliance.mda.runtime.mda;
 import com.brilliance.mda.runtime.mda.impl.EnvConfig;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -25,7 +26,7 @@ public interface IContext extends Serializable {
 
     void setFieldError(IBaseObject baseobj, String errMsg);//Platform.error()
 
-    void setMessage(String errorNo, String message);//Platform.message()
+    void setMessage(String errorNo, Object message);//Platform.message()
 
     IModule getRoot();
 

gjjs-bd-runtime/src/main/java/com/brilliance/mda/runtime/mda/IDaoSession.java

 package com.brilliance.mda.runtime.mda;
 
 import com.brilliance.mda.runtime.mda.impl.Argument;
+
+import java.util.List;
+
 public interface IDaoSession {
 	
 	void dbBegin();
@@ -53,4 +56,6 @@ public interface IDaoSession {
 	void dbReadset(IModuleList list, int maxSize, String sql);
 
 	String dbName();
+
+	List<String> dbColumnNames();
 }

gjjs-bd-runtime/src/main/java/com/brilliance/mda/runtime/mda/driver/MdaContext.java

@@ -127,10 +127,10 @@ public class MdaContext implements IContext {
         setFieldError(baseobj.getPath(), errMsg);
     }
 
-    public void setMessage(String errorNo, String message) {
+    public void setMessage(String errorNo, Object message) {
         if (errorNo != null && errorNo.matches("E\\d+")) {
             this.errorNo = errorNo;
-            this.message = message;
+            this.message = message + "";
         }
     }