Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/jsc/JscMapper.java

@@ -4,6 +4,7 @@ import com.onemap.apply.mapper.jsc.provider.JscSqlProvider;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.SelectProvider;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -15,6 +16,6 @@ import java.util.Map;
 public interface JscMapper {
 
     @SelectProvider(value = JscSqlProvider.class, method = "getSqlListByMap")
-    public List<Map<String, Object>> getBeanListByEntity(Map<String, Object> map);
+    public List<LinkedHashMap<String, Object>> getBeanListByEntity(Map<String, Object> map);
 
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/jsc/JscServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -62,7 +63,7 @@ public class JscServiceImpl implements JscService {
             queryMap.put("val2", val2);
         }
         queryMap.put("jsc_sql", jscSql);
-        List<Map<String, Object>> list = jscMapper.getBeanListByEntity(queryMap);
+        List<LinkedHashMap<String, Object>> list = jscMapper.getBeanListByEntity(queryMap);
         if (list.size() != 1) {
             return RequestResult.error("查询数据有误，请检查！");
         }
@@ -105,7 +106,7 @@ public class JscServiceImpl implements JscService {
             queryMap.put("val2", val2);
         }
         queryMap.put("jsc_sql", jscSql);
-        List<Map<String, Object>> list = jscMapper.getBeanListByEntity(queryMap);
+        List<LinkedHashMap<String, Object>> list = jscMapper.getBeanListByEntity(queryMap);
         return RequestResult.success(list);
     }