Merge branch 'dev'

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -1048,9 +1048,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             }
 
             //获取小程序appID
-            SysConfig sysConfig = iSysConfigService.getOne(new LambdaQueryWrapper<SysConfig>()
-                    .eq(SysConfig::getConfigKey, "wx.small.appid")
-                    .eq(SysConfig::getTenantId, goodsVo.getTenantId()));
+            SysConfig sysConfig = iSysConfigService.getSysConfigByKeyTenant("wx.small.appid",goodsVo.getTenantId());
             if (ObjectUtils.isNotNull(sysConfig)) {
                 goodsVo.setWeAppId(sysConfig.getConfigValue());
             }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysConfigMapper.java

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.system.domain.SysConfig;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 参数配置 数据层
@@ -10,4 +12,6 @@ import com.zhongzheng.modules.system.domain.SysConfig;
  */
 public interface SysConfigMapper extends BaseMapper<SysConfig> {
 
+    @InterceptorIgnore(tenantLine = "true")
+    SysConfig getSysConfigByKeyTenant(@Param("key") String key,@Param("tenantId") Long tenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysConfigService.java

@@ -74,4 +74,6 @@ public interface ISysConfigService extends IService<SysConfig> {
      * @return 结果
      */
     public String checkConfigKeyUnique(SysConfigVo config);
+
+    SysConfig getSysConfigByKeyTenant(String key, Long tenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysConfigServiceImpl.java

@@ -198,6 +198,11 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
         return UserConstants.UNIQUE;
     }
 
+    @Override
+    public SysConfig getSysConfigByKeyTenant(String key, Long tenantId) {
+        return baseMapper.getSysConfigByKeyTenant(key, tenantId);
+    }
+
     /**
      * 设置cache key
      *

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -703,7 +703,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             m.category_name as majorName,
             o.tenant_id as tenantId,
             g.goods_type as courseType,
-            concat('https://file-dev.xyyxt.net/', g.cover_url) as imageUrl,
+            concat('https://file.xyyxt.net/', g.cover_url) as imageUrl,
             o.create_time as createTimeStr,
             og.grade_id as gradeId
         FROM

zhongzheng-system/src/main/resources/mapper/modules/system/SysConfigMapper.xml

@@ -16,4 +16,8 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <select id="getSysConfigByKeyTenant" parameterType="map" resultType="com.zhongzheng.modules.system.domain.SysConfig">
+        select * from sys_config where config_key = #{key} and tenant_id = #{tenantId}
+    </select>
+
 </mapper>