Merge branch 'develop_3' into 'develop_master'

Develop 3 See merge request LiuChao/foton-slrs-system-rest!366
2022-01-11 13:39:28 +08:00
parent 914d2c3d06 1b2c595f50
commit 925ab6219e
9 changed files with 116 additions and 16 deletions
@@ -81,13 +81,13 @@ public class SarAdvanceSearchUtil {


    /**
-     * 国内外标准高级查询 对SAR_STAND_ATTR_INFO表自定义字段生成条件语句
+     * 国内外标准高级查询 对tableName表自定义字段生成条件语句
     * @param searchVOList
     * @return
     */
-    public static String createStandSql(List<SarAdvanceSearchVO> searchVOList) {
+    public static String createStandSql(List<SarAdvanceSearchVO> searchVOList,String tableName) {
+        tableName=tableName+".";
        String sqlInfo = "";
-        String tableName="SAR_STAND_ATTR_INFO.";
        StringBuilder sqlBuilder = new StringBuilder();
        if (searchVOList != null && !searchVOList.isEmpty()) {