diff --git a/src/main/java/com/sincere/student/controller/AdminController.java b/src/main/java/com/sincere/student/controller/AdminController.java index 5576722..ae7ad54 100644 --- a/src/main/java/com/sincere/student/controller/AdminController.java +++ b/src/main/java/com/sincere/student/controller/AdminController.java @@ -438,15 +438,7 @@ public class AdminController { @RequestMapping(value = "/major/delete" , method = RequestMethod.POST) public BaseDto deleteMajor(@RequestBody IdDto idDto){ BaseDto result = new BaseDto() ; - MajorSearchDto majorSearchDto = new MajorSearchDto() ; - majorSearchDto.setPid(idDto.getId()); - Page page = majorService.getList(majorSearchDto); - if(page.getCount() == 0){ - majorService.delete(idDto.getId()); - }else { - result.setSuccess(false); - result.setMessage("还有下级专业,删除失败"); - } + majorService.delete(idDto.getId()); return result ; } diff --git a/src/main/java/com/sincere/student/mapper/MajorMapper.java b/src/main/java/com/sincere/student/mapper/MajorMapper.java index ccd62bf..b960420 100644 --- a/src/main/java/com/sincere/student/mapper/MajorMapper.java +++ b/src/main/java/com/sincere/student/mapper/MajorMapper.java @@ -16,5 +16,7 @@ public interface MajorMapper { int delete(int id); + int deleteByPid(int id); + List selectMajor(); } diff --git a/src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java b/src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java index 08c5192..3430ad3 100644 --- a/src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java +++ b/src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java @@ -50,7 +50,9 @@ public class MajorServiceImpl implements MajorService { @Override public int delete(int id) { - return majorMapper.delete(id); + majorMapper.delete(id); + majorMapper.deleteByPid(id); + return 1; } @Override diff --git a/src/main/resources/mapper/MajorMapper.xml b/src/main/resources/mapper/MajorMapper.xml index 65c82f8..f43dcde 100644 --- a/src/main/resources/mapper/MajorMapper.xml +++ b/src/main/resources/mapper/MajorMapper.xml @@ -43,6 +43,10 @@ delete university_major where id = #{id} + + delete university_major where p_id = #{id} + + update university_major -- libgit2 0.21.0