配置表查询修改;

mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/mapper/SysTableConfigMapper.java

@@ -23,7 +23,7 @@ public interface SysTableConfigMapper extends BaseMapper<SysTableConfig> {
      * @param key 配置键
      * @return 配置信息
      */
-    @Select("SELECT * FROM sys_table_config WHERE organization_id = #{organizationId} AND key = #{key} and warehouse_id = #{warehouseId} and shipper_id = #{shipperId}")
+    //@Select("SELECT * FROM sys_table_config WHERE organization_id = #{organizationId} AND key = #{key} and warehouse_id = #{warehouseId} and shipper_id = #{shipperId}")
     SysTableConfig getByOrgIdAndKey(@Param("organizationId") Long organizationId, @Param("key") String key, @Param("warehouseId") Long warehouseId, @Param("shipperId") Long shipperId);
 
     /**
@@ -31,7 +31,7 @@ public interface SysTableConfigMapper extends BaseMapper<SysTableConfig> {
      * @param organizationId 组织 ID
      * @return 配置列表
      */
-    @Select("SELECT * FROM sys_table_config WHERE organization_id = #{organizationId} and warehouse_id = #{warehouseId} and shipper_id = #{shipperId} ORDER BY create_time DESC")
+    //@Select("SELECT * FROM sys_table_config WHERE organization_id = #{organizationId} and warehouse_id = #{warehouseId} and shipper_id = #{shipperId} ORDER BY create_time DESC")
     List<SysTableConfig> listByOrgId(@Param("organizationId") Long organizationId, @Param("warehouseId") Long warehouseId, @Param("shipperId") Long shipperId);
 
     /**

mhd_oms/src/main/resources/mapper/sysTableConfig/SysTableConfigMapper.xml

@@ -2,6 +2,48 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.mhd.oms.domain.sysTableConfig.repository.mapper.SysTableConfigMapper">
 
+
+    <select id="getByOrgIdAndKey" resultType="com.mhd.oms.domain.sysTableConfig.entity.SysTableConfig">
+        SELECT
+        *
+        FROM sys_table_config
+        WHERE 1=1
+        <if test="organizationId != null">
+            AND a.organization_id = #{organizationId}
+        </if>
+        <if test="warehouseId != null">
+            AND a.warehouse_id = #{warehouseId}
+        </if>
+        <if test="shipperId != null">
+            AND a.shipper_id = #{shipperId}
+        </if>
+        <if test="key != null and key != ''">
+            AND a.key = #{key}
+        </if>
+        ORDER BY a.create_time DESC
+    </select>
+
+    <select id="listByOrgId" resultType="com.mhd.oms.domain.sysTableConfig.entity.SysTableConfig">
+
+
+        SELECT
+        *
+        FROM sys_table_config
+        WHERE 1=1
+        <if test="organizationId != null">
+            AND a.organization_id = #{organizationId}
+        </if>
+        <if test="warehouseId != null">
+            AND a.warehouse_id = #{warehouseId}
+        </if>
+        <if test="shipperId != null">
+            AND a.shipper_id = #{shipperId}
+        </if>
+        <if test="key != null and key != ''">
+            AND a.key = #{key}
+        </if>
+        ORDER BY a.create_time DESC
+    </select>
     <!-- 分页查询配置列表 -->
     <select id="queryList" parameterType="java.lang.String" resultType="com.mhd.oms.domain.sysTableConfig.repository.vo.SysTableConfigVO">
         SELECT