计划修改

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityGradePrivilegeMapper.java

@@ -21,4 +21,6 @@ public interface ActivityGradePrivilegeMapper extends BaseMapper<ActivityGradePr
      *
      */
     List<ActivityGradePrivilegeVo> selectGradePriList(Long id);
+
+    void deleteByGrade(Long id);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityGradePrivilegeService.java

@@ -49,4 +49,6 @@ public interface IActivityGradePrivilegeService extends IService<ActivityGradePr
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    void removeByGrade(Long id);
 }

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

@@ -96,4 +96,9 @@ public class ActivityGradePrivilegeServiceImpl extends ServiceImpl<ActivityGrade
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public void removeByGrade(Long id) {
+        baseMapper.deleteByGrade(id);
+    }
 }

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

@@ -150,6 +150,7 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         update.setUpdateTime(DateUtils.getNowTime());
         validEntityBeforeSave(update);
         //修改特权类型
+        activityGradePrivilegeService.removeByGrade(bo.getId());
         if (!CollectionUtils.isEmpty(bo.getActivityGradePrivilegeEditBos())) {
             updateGradePrivilege(bo.getActivityGradePrivilegeEditBos());
         }
@@ -157,27 +158,14 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
     }
 
     private void updateGradePrivilege(List<ActivityGradePrivilegeEditBo> activityGradePrivilegeEditBos) {
+
         activityGradePrivilegeEditBos.stream().forEach(p ->{
-                //修改未删除
-                if (p.getId() != null && p.getStatus() == 1) {
-                    activityGradePrivilegeService.updateByEditBo(p);
-                    activityGradePrivilegeCouresService.removeById(p.getId());
-                    Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresMapper
-                            .insertCouse(new ActivityGradePrivilegeCoures().setPrivilegeId(p.getId())
-                                    .setCourseId(Convert.toLong(c))));
-                  //  增加
-                }else if(p.getId() == null){
+                //修改
                     ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
                     activityGradePrivilegeService.save(activityGradePrivilege);
                     Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresMapper
                             .insertCouse(new ActivityGradePrivilegeCoures().setPrivilegeId(activityGradePrivilege.getId())
                                     .setCourseId(Convert.toLong(c))));
-                    //删除
-                }else {
-                    ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
-                    activityGradePrivilegeService.removeById(activityGradePrivilege.getId());
-                }
-
             });
     }
 

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityGradePrivilegeMapper.xml

@@ -53,4 +53,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN course e ON f.course_id = e.course_id
         WHERE c.grade_id = #{id,jdbcType=INTEGER} and c.status != 0
     </select>
+
+
+    <update id="deleteByGrade" parameterType="Long" >
+        UPDATE activity_grade_privilege SET `status` =0 where grade_id=#{id}
+    </update>
 </mapper>