LY 专项培训

master/src/main/java/com/ruoyi/project/training/controller/TTrainingCompanylevelController.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.task.CompanyLevelTask;
 import com.ruoyi.project.training.domain.TTrainingHisparticipants;
 import com.ruoyi.project.training.domain.TTrainingParticipants;
@@ -181,12 +182,14 @@ public class TTrainingCompanylevelController extends BaseController
     public AjaxResult edit(@RequestBody TTrainingCompanylevel tTrainingCompanylevel)
     {
         TTrainingCompanylevel trainingCompanylevel = tTrainingCompanylevelService.selectTTrainingCompanylevelById(tTrainingCompanylevel.getId());
-        if (tTrainingCompanylevel.getStaffId() != null) {
+        if ( StringUtils.isNotEmpty(tTrainingCompanylevel.getStaffId())) {
             String[] newStaffs = tTrainingCompanylevel.getStaffId().split(",");
             if (trainingCompanylevel.getStaffId() != null) {
                 //如果曾经旧名单中选择过数据
                 TTrainingParticipants participants = new TTrainingParticipants();
                 participants.setCompanyId(trainingCompanylevel.getId());
+                //删除原有关系
+                tTrainingParticipantsMapper.deleteTParticipantsByCompanyId(trainingCompanylevel.getId());
                 for (String n : newStaffs) {
                     participants.setStaffId(n);
                     List<TTrainingParticipants> participantsList = tTrainingParticipantsService.selectTTrainingParticipantsList(participants);

master/src/main/java/com/ruoyi/project/training/mapper/TTrainingParticipantsMapper.java

@@ -78,4 +78,6 @@ public interface TTrainingParticipantsMapper
      * @return 结果
      */
     public int deleteTTrainingParticipantsAll();
+
+    void deleteTParticipantsByCompanyId(Long id);
 }

master/src/main/resources/mybatis/training/TTrainingParticipantsMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.training.mapper.TTrainingParticipantsMapper">
-    
+
     <resultMap type="TTrainingParticipants" id="TTrainingParticipantsResult">
         <result property="id"    column="id"    />
         <result property="staffId"    column="staff_id"    />
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTTrainingParticipantsList" parameterType="TTrainingParticipants" resultMap="TTrainingParticipantsResult">
         <include refid="selectTTrainingParticipantsVo"/>
-        <where>  
+        <where>
             <if test="staffId != null "> and d.staff_id = #{staffId}</if>
             <if test="companyId != null "> and company_id = #{companyId}</if>
             and d.del_flag = 0
@@ -52,12 +52,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        order by end_date
     </select>
 
-    
+
     <select id="selectTTrainingParticipantsById" parameterType="Long" resultMap="TTrainingParticipantsResult">
         <include refid="selectTTrainingParticipantsVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTTrainingParticipants" parameterType="TTrainingParticipants">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_training_participants.NEXTVAL as id FROM DUAL
@@ -161,11 +161,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_training_participants set del_flag = 2 where del_flag = 0
     </update>
 
+    <update id="deleteTParticipantsByCompanyId">
+        update t_training_participants set del_flag = 2 where company_id = #{companyId}
+    </update>
+
     <update id="deleteTTrainingParticipantsByIds" parameterType="String">
         update t_training_participants set del_flag = 2 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>