瀏覽代碼

问题修改

zhs 2 年之前
父節點
當前提交
0839108e49

+ 2 - 2
src/main/java/com/tld/config/MyRedissonConfig.java

@@ -16,11 +16,11 @@ public class MyRedissonConfig {
     public RedissonClient redissonClient(){
         // 创建配置 指定redis地址及节点信息
         Config config = new Config();
-        config.useSingleServer().setAddress("redis://10.2.111.91:6379").setPassword("#09SilverB");
+        config.useSingleServer().setAddress("redis://8.142.144.205:6379").setPassword("#09SilverB");
         //redis集群使用
 //        config.useClusterServers().addNodeAddress("redis://8.142.144.205:6379");
         // 根据config创建出RedissonClient实例
-        RedissonClient redissonClient = Redisson.create(config);
+        RedissonClient  redissonClient = Redisson.create(config);
         return redissonClient;
     }
 }

+ 1 - 1
src/main/resources/mapper/AskGoodsMapper.xml

@@ -789,7 +789,7 @@
             b.code as materialCode,
             a.storage_code,
             a.wbs,
-            c.real_name as realName,
+            c.real_name as realName
         from tld_removal_half a
         left join tld_material b on a.wllb_code = b.code
         left join tld_user c on a.user_id = c.id

+ 3 - 0
src/main/resources/mapper/QueryListMappeer.xml

@@ -121,6 +121,9 @@
             <if test="companyName != null and companyName != ''">
                 and p.name like CONCAT(CONCAT('%', #{companyName}), '%')
             </if>
+            <if test="companyCode != null and companyCode != ''">
+                and p.code = #{companyCode}
+            </if>
             <if test="supplierId != null and supplierId != ''">
                 and a.supplier_id like CONCAT(CONCAT('%', #{supplierId}), '%')
             </if>