Merge branch 'master' of http://124.222.105.7:3000/dianliang/dl_site_system

dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiKeywordMapper.java

@@ -26,4 +26,5 @@ public interface BusiKeywordMapper extends BaseMapper<BusiKeyword>
     **/
     Date selectNewDate();
 
+    void deleteByIdAndTenantId(@Param("id") String item, @Param("tenantId") String tenantId);
 }

dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiKeywordServiceImpl.java

@@ -69,6 +69,8 @@ public class BusiKeywordServiceImpl extends ServiceImpl<BusiKeywordMapper,BusiKe
                         keywordItem.setTenantId(prodNew.getTenantId());
                         keywordItem.setCreateTime(nowDate);
                         insertList.add(keywordItem);
+                        //根据id和tenantId删除对应的关键词
+                        busiKeywordMapper.deleteByIdAndTenantId(item,prodNew.getTenantId());
                     });
                 }
                 if(!insertList.isEmpty()){

dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiKeywordMapper.xml

@@ -12,6 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectBusiKeywordVo">
         select id, tenant_id from dl_busi_keyword
     </sql>
+    <delete id="deleteByIdAndTenantId">
+        DELETE dl_busi_keyword WHERE id =#{id} AND tenant_id=#{tenantId}
+    </delete>
 
     <select id="queryListPage" parameterType="BusiKeyword" resultMap="BusiKeywordResult">
         <include refid="selectBusiKeywordVo"/>