IStream package change

gjjs-bd-annonation-enhance/src/main/java/com/brilliance/annotation/processor/enhance/impl/BDGetterEnhance.java

@@ -2,7 +2,7 @@ package com.brilliance.annotation.processor.enhance.impl;
 
 import com.brilliance.annotation.processor.enhance.AbstractAnnotationEnhance;
 import com.brilliance.mda.runtime.mda.IModuleList;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 import com.brilliance.mda.runtime.mda.impl.ModuleList;
 import com.brilliance.mda.runtime.mda.impl.StreamImpl;
 import com.sun.tools.javac.code.Flags;

gjjs-bd-annonation-enhance/src/main/java/com/brilliance/annotation/processor/enhance/impl/BDSetterEnhance.java

@@ -3,7 +3,7 @@ package com.brilliance.annotation.processor.enhance.impl;
 import com.brilliance.annotation.processor.AnnotationEnhanceUtils;
 import com.brilliance.annotation.processor.PrimitiveEnums;
 import com.brilliance.annotation.processor.enhance.AbstractAnnotationEnhance;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 import com.brilliance.mda.runtime.mda.impl.StreamImpl;
 import com.sun.tools.javac.code.Flags;
 import com.sun.tools.javac.code.TypeTag;

gjjs-bd-annonation-enhance/src/main/java/com/brilliance/annotation/processor/enhance/impl/TDGetterEnhance.java

@@ -3,7 +3,7 @@ package com.brilliance.annotation.processor.enhance.impl;
 import com.brilliance.annotation.processor.AnnotationEnhanceUtils;
 import com.brilliance.annotation.processor.enhance.AbstractAnnotationEnhance;
 import com.brilliance.mda.runtime.mda.IModuleList;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 import com.brilliance.mda.runtime.mda.impl.ModuleList;
 import com.brilliance.mda.runtime.mda.impl.StreamImpl;
 import com.sun.tools.javac.code.Flags;

gjjs-bd-annonation-enhance/src/main/java/com/brilliance/annotation/processor/enhance/impl/TDSetterEnhance.java

@@ -3,7 +3,7 @@ package com.brilliance.annotation.processor.enhance.impl;
 import com.brilliance.annotation.processor.AnnotationEnhanceUtils;
 import com.brilliance.annotation.processor.PrimitiveEnums;
 import com.brilliance.annotation.processor.enhance.AbstractAnnotationEnhance;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 import com.brilliance.mda.runtime.mda.impl.StreamImpl;
 import com.sun.tools.javac.code.Flags;
 import com.sun.tools.javac.code.TypeTag;

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

@@ -148,7 +148,11 @@ public class MybatisArgumentAdapter {
 
         String sql = "";
         if (join) {
+            if(conditions.startsWith("SELECT") || conditions.startsWith("select")){
+                sql = conditions;
+            }else {
                 sql = String.format(pattern, conditions);
+            }
         } else {
             sql = String.format(pattern, tableName, conditions);
         }

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

 package com.brilliance.mda.runtime.mda;
 
-import org.sss.common.model.IStream;
-
 public interface IAuthInfo {
     //获取当前用户登录ID
     String getUsrInr();

gjjs-bd-runtime/src/main/java/org/sss/common/model/IStream.java → gjjs-bd-runtime/src/main/java/com/brilliance/mda/runtime/mda/IStream.java

-package org.sss.common.model;
+package com.brilliance.mda.runtime.mda;
 
 import com.brilliance.mda.runtime.mda.IDataGrid;
 import com.fasterxml.jackson.annotation.JsonIgnoreType;

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

@@ -4,7 +4,7 @@ import com.brilliance.mda.runtime.mda.*;
 import com.brilliance.mda.runtime.mda.impl.AbstractDaoSession;
 import com.brilliance.mda.runtime.mda.impl.EnvConfig;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 
 import java.math.BigDecimal;
 import java.util.*;

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

 package com.brilliance.mda.runtime.mda.impl;
 
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 import com.fasterxml.jackson.annotation.JsonIgnoreType;
 
 import java.io.ByteArrayInputStream;

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

 package com.brilliance.mda.runtime.mda.impl;
 
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 
 import java.io.InputStream;
 import java.io.OutputStream;

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

@@ -9,7 +9,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.CollectionUtils;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;

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

@@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 
 import java.math.BigDecimal;
 import java.util.*;

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

 package com.brilliance.mda.runtime.mda.util;
 
 import com.brilliance.mda.runtime.mda.IBaseObject;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 import com.brilliance.mda.runtime.mda.driver.MdaEnv;
 import com.brilliance.mda.runtime.response.ResponseSet;
 import org.apache.commons.codec.digest.DigestUtils;

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

@@ -23,7 +23,7 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 
 import java.io.*;
 import java.math.BigDecimal;

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

@@ -8,7 +8,7 @@ import com.brilliance.mda.runtime.request.SelectedParams;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 
 import java.io.IOException;
 import java.io.InputStream;

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

 package com.brilliance.mda.runtime.mda.util;
 
 import com.brilliance.mda.runtime.mda.IDatafield;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 import com.brilliance.mda.runtime.mda.driver.MdaEnv;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -17,7 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 
 import java.io.BufferedWriter;
 import java.io.File;

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

@@ -2,7 +2,7 @@ package com.brilliance.mda.runtime.request;
 
 import com.brilliance.mda.runtime.mda.IBaseObject;
 import com.brilliance.mda.runtime.mda.IDatafield;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 import com.brilliance.mda.runtime.mda.driver.MdaDriver;
 import com.brilliance.mda.runtime.mda.impl.StreamImpl;
 import com.brilliance.mda.runtime.mda.util.MdaUtils;

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

@@ -7,7 +7,7 @@ import com.brilliance.mda.runtime.mda.impl.StreamImpl;
 import com.brilliance.mda.runtime.mda.util.MdaUtils;
 import com.brilliance.mda.runtime.mda.util.Strings;
 import com.brilliance.mda.runtime.mda.util.Systems;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 
 import java.util.List;
 

gjjs-bd-runtime/src/main/java/com/brilliance/mda/support/td/BDAuthInfo.java

 package com.brilliance.mda.support.td;
 
 import com.brilliance.mda.runtime.mda.IAuthInfo;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 import com.brilliance.mda.runtime.mda.impl.StreamImpl;
 
 import java.util.List;

gjjs-bd-runtime/src/main/java/com/brilliance/mda/support/td/ModuleInfoManager.java

@@ -3,7 +3,7 @@ package com.brilliance.mda.support.td;
 
 import com.brilliance.mda.runtime.mda.FieldHolder;
 import com.brilliance.mda.runtime.mda.IPanel;
-import org.sss.common.model.IStream;
+import com.brilliance.mda.runtime.mda.IStream;
 import com.brilliance.mda.runtime.mda.ModuleHolder;
 import com.brilliance.mda.runtime.mda.impl.AbstractModule;
 import com.brilliance.mda.runtime.mda.impl.ModuleList;