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

onemap-modules/onemap-system/src/main/java/com/onemap/system/service/impl/TTableFiledRelationServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.onemap.common.core.utils.DateUtils;
 import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.security.utils.SecurityUtils;
 import com.onemap.system.domain.TTableFiledRelation;
 import com.onemap.system.mapper.TTableFiledRelationMapper;
 import com.onemap.system.service.ITTableFiledRelationService;
@@ -53,6 +54,7 @@ public class TTableFiledRelationServiceImpl implements ITTableFiledRelationServi
     public int insertTTableFiledRelation(TTableFiledRelation tTableFiledRelation) {
         tTableFiledRelation.setId(StringUtils.getUUID());
         tTableFiledRelation.setCreateTime(DateUtils.getNowDate());
+        tTableFiledRelation.setCreateUserId(String.valueOf(SecurityUtils.getUserId()));
         return tTableFiledRelationMapper.insertTTableFiledRelation(tTableFiledRelation);
     }
 

onemap-modules/onemap-system/src/main/java/com/onemap/system/service/impl/TTableFiledServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.onemap.common.core.utils.DateUtils;
 import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.security.utils.SecurityUtils;
 import com.onemap.system.domain.TTableFiled;
 import com.onemap.system.mapper.TTableFiledMapper;
 import com.onemap.system.service.ITTableFiledService;
@@ -57,6 +58,7 @@ public class TTableFiledServiceImpl implements ITTableFiledService
     {
         tTableFiled.setId(StringUtils.getUUID());
         tTableFiled.setCreateTime(DateUtils.getNowDate());
+        tTableFiled.setCreateUserId(String.valueOf(SecurityUtils.getUserId()));
         return tTableFiledMapper.insertTTableFiled(tTableFiled);
     }
 

onemap-modules/onemap-system/src/main/java/com/onemap/system/service/impl/TTableLayerServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.onemap.common.core.utils.DateUtils;
 import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.security.utils.SecurityUtils;
 import com.onemap.system.domain.TTableLayer;
 import com.onemap.system.mapper.TTableLayerMapper;
 import com.onemap.system.service.ITTableLayerService;
@@ -53,6 +54,7 @@ public class TTableLayerServiceImpl implements ITTableLayerService {
     public int insertTTableLayer(TTableLayer tTableLayer) {
         tTableLayer.setId(StringUtils.getUUID());
         tTableLayer.setCreateTime(DateUtils.getNowDate());
+        tTableLayer.setCreateUserId(String.valueOf(SecurityUtils.getUserId()));
         return tTableLayerMapper.insertTTableLayer(tTableLayer);
     }
 

onemap-modules/onemap-system/src/main/java/com/onemap/system/service/impl/TTableServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.onemap.common.core.utils.DateUtils;
 import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.security.utils.SecurityUtils;
 import com.onemap.system.domain.TTable;
 import com.onemap.system.mapper.TTableMapper;
 import com.onemap.system.service.ITTableService;
@@ -57,6 +58,7 @@ public class TTableServiceImpl implements ITTableService
     {
         tTable.setId(StringUtils.getUUID());
         tTable.setCreateTime(DateUtils.getNowDate());
+        tTable.setCreateUserId(String.valueOf(SecurityUtils.getUserId()));
         return tTableMapper.insertTTable(tTable);
     }
 

onemap-modules/onemap-system/src/main/resources/mapper/postgresql/system/TTableFiledMapper.xml

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTTableFiledVo"/>
         <where>  
             <if test="filedName != null  and filedName != ''"> and filed_name like concat('%', #{filedName}, '%')</if>
-            <if test="filedZh != null  and filedZh != ''"> and filed_zh = #{filedZh}</if>
+            <if test="filedZh != null  and filedZh != ''"> and filed_zh like concat('%', #{filedZh}, '%')</if>
             <if test="filedDescribe != null  and filedDescribe != ''"> and filed_describe = #{filedDescribe}</if>
             <if test="filedType != null  and filedType != ''"> and filed_type = #{filedType}</if>
             <if test="filedTypeLen != null  and filedTypeLen != ''"> and filed_type_len = #{filedTypeLen}</if>

onemap-modules/onemap-system/src/main/resources/mapper/postgresql/system/TTableLayerMapper.xml

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupcolumn != null  and groupcolumn != ''"> and groupcolumn = #{groupcolumn}</if>
             <if test="stateType != null  and stateType != ''"> and state_type = #{stateType}</if>
         </where>
+        order by sort asc
     </select>
     
     <select id="selectTTableLayerById" parameterType="String" resultMap="TTableLayerResult">

onemap-modules/onemap-system/src/main/resources/mapper/postgresql/system/TTableMapper.xml

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTTableVo"/>
         <where>  
             <if test="tableName != null  and tableName != ''"> and table_name like concat('%', #{tableName}, '%')</if>
-            <if test="tableDescribe != null  and tableDescribe != ''"> and table_describe = #{tableDescribe}</if>
+            <if test="tableDescribe != null  and tableDescribe != ''"> and table_describe like concat('%', #{tableDescribe}, '%')</if>
             <if test="tableType != null "> and table_type = #{tableType}</if>
             <if test="isExist != null "> and is_exist = #{isExist}</if>
             <if test="deleteTime != null "> and delete_time = #{deleteTime}</if>
@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deleteUserId != null  and deleteUserId != ''"> and delete_user_id = #{deleteUserId}</if>
             <if test="version != null  and version != ''"> and version = #{version}</if>
         </where>
+        order by table_name
     </select>
     
     <select id="selectTTableById" parameterType="String" resultMap="TTableResult">