修改学校和专业的删除逻辑，当删除学校或者专业的时候会将个人收藏表里面收藏的学校和专业也删除掉

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbSchoolMajorMapper.java

@@ -74,4 +74,8 @@ public interface TbSchoolMajorMapper
     public int deleteTbSchoolMajorByIds(String[] ids);
 
     public int deleteTbSchoolMajorBySchoolIds(String[] ids);
+
+    public int deleteTbPerCollectByMajorId(Long id);
+
+    public int deleteTbPerCollectByMajorIds(String[] ids);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbSchoolMapper.java

@@ -73,4 +73,10 @@ public interface TbSchoolMapper
      * @return
      */
     public List<TbSchool> selectSchoolCampusByID(Long id);
+
+    public int deleteTbPerCollectBySchoolId(Long id);
+    public int deleteTbPerCollectBySchoolIds(String[] ids);
+
+    public int deleteTbPerCollectByMajorId(Long id);
+    public int deleteTbPerCollectByMajorIds(String[] ids);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbSchoolMajorServiceImpl.java

@@ -15,6 +15,7 @@ import com.ruoyi.system.mapper.TbSchoolMajorMapper;
 import com.ruoyi.system.domain.TbSchoolMajor;
 import com.ruoyi.system.service.ITbSchoolMajorService;
 import com.ruoyi.common.core.text.Convert;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 学校专业Service业务层处理
@@ -260,8 +261,10 @@ public class TbSchoolMajorServiceImpl implements ITbSchoolMajorService
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteTbSchoolMajorByIds(String ids)
     {
+        tbSchoolMajorMapper.deleteTbPerCollectByMajorIds(Convert.toStrArray(ids));
         return tbSchoolMajorMapper.deleteTbSchoolMajorByIds(Convert.toStrArray(ids));
     }
 
@@ -272,8 +275,10 @@ public class TbSchoolMajorServiceImpl implements ITbSchoolMajorService
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteTbSchoolMajorById(Long id)
     {
+        tbSchoolMajorMapper.deleteTbPerCollectByMajorId(id);
         return tbSchoolMajorMapper.deleteTbSchoolMajorById(id);
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbSchoolServiceImpl.java

@@ -232,6 +232,8 @@ public class TbSchoolServiceImpl implements ITbSchoolService
         tbSchoolUploadMaterialMapper.deleteTbSchoolUploadMaterialBySchoolIds(Convert.toStrArray(ids));
         tbSchoolAtlasMapper.deleteTbSchoolAtlasBySchoolIds(Convert.toStrArray(ids));
         tbEnrollmentTimeMapper.deleteTbEnrollmentTimeBySchoolIds(Convert.toStrArray(ids));
+        tbSchoolMapper.deleteTbPerCollectBySchoolIds(Convert.toStrArray(ids));
+        tbSchoolMapper.deleteTbPerCollectByMajorIds(Convert.toStrArray(ids));
         return tbSchoolMapper.deleteTbSchoolByIds(Convert.toStrArray(ids));
     }
 
@@ -252,6 +254,8 @@ public class TbSchoolServiceImpl implements ITbSchoolService
         tbSchoolUploadMaterialMapper.deleteTbSchoolUploadMaterialBySchoolId(id);
         tbSchoolAtlasMapper.deleteTbSchoolAtlasBySchoolId(id);
         tbEnrollmentTimeMapper.deleteTbEnrollmentTimeBySchoolId(id);
+        tbSchoolMapper.deleteTbPerCollectBySchoolId(id);
+        tbSchoolMapper.deleteTbPerCollectByMajorId(id);
         return tbSchoolMapper.deleteTbSchoolById(id);
     }
 }

ruoyi-system/src/main/resources/mapper/system/TbSchoolMajorMapper.xml

@@ -167,10 +167,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from tb_school_major where id = #{id}
     </delete>
 
-    <delete id="deleteTbSchoolMajorBySchoolId" parameterType="Long">
-        delete from tb_school_major where school_id = #{id}
-    </delete>
-
     <delete id="deleteTbSchoolMajorByIds" parameterType="String">
         delete from tb_school_major where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
@@ -178,8 +174,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <delete id="deleteTbSchoolMajorBySchoolIds" parameterType="String">
-        delete from tb_school_major where school_id in
+    <delete id="deleteTbPerCollectByMajorId" parameterType="Long">
+        delete from tb_per_collect where collect_id = #{id} and collect_type=2
+    </delete>
+
+    <delete id="deleteTbPerCollectByMajorIds" parameterType="String">
+        delete from tb_per_collect where collect_type=2 and collect_id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

ruoyi-system/src/main/resources/mapper/system/TbSchoolMapper.xml

@@ -145,6 +145,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from tb_school where id = #{id}
     </delete>
 
+    <delete id="deleteTbPerCollectBySchoolId" parameterType="Long">
+        delete from tb_per_collect where collect_id = #{id} and collect_type=1
+    </delete>
+
     <delete id="deleteTbSchoolByIds" parameterType="String">
         delete from tb_school where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
@@ -152,4 +156,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <delete id="deleteTbPerCollectBySchoolIds" parameterType="String">
+        delete from tb_per_collect where collect_type=1 and collect_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+
+    <delete id="deleteTbPerCollectByMajorId" parameterType="Long">
+        delete from tb_per_collect
+        where collect_id
+                  in (select id from tb_school_major where school_id=#{id})
+          and collect_type=2
+    </delete>
+
+    <delete id="deleteTbPerCollectByMajorIds" parameterType="String">
+        delete from tb_per_collect where collect_type=2 and collect_id in
+                                                            (select id from tb_school_major where
+        school_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        )
+    </delete>
 </mapper>
\ No newline at end of file