Commit d10218de9168e63864ec957d8b19ce7d787c9443
1 parent
1ad1148e
Exists in
master
bug 修复
Showing
4 changed files
with
10 additions
and
10 deletions
Show diff stats
src/main/java/com/sincere/student/controller/AdminController.java
| @@ -438,15 +438,7 @@ public class AdminController { | @@ -438,15 +438,7 @@ public class AdminController { | ||
| 438 | @RequestMapping(value = "/major/delete" , method = RequestMethod.POST) | 438 | @RequestMapping(value = "/major/delete" , method = RequestMethod.POST) |
| 439 | public BaseDto deleteMajor(@RequestBody IdDto idDto){ | 439 | public BaseDto deleteMajor(@RequestBody IdDto idDto){ |
| 440 | BaseDto result = new BaseDto() ; | 440 | BaseDto result = new BaseDto() ; |
| 441 | - MajorSearchDto majorSearchDto = new MajorSearchDto() ; | ||
| 442 | - majorSearchDto.setPid(idDto.getId()); | ||
| 443 | - Page<Major> page = majorService.getList(majorSearchDto); | ||
| 444 | - if(page.getCount() == 0){ | ||
| 445 | - majorService.delete(idDto.getId()); | ||
| 446 | - }else { | ||
| 447 | - result.setSuccess(false); | ||
| 448 | - result.setMessage("还有下级专业，删除失败"); | ||
| 449 | - } | 441 | + majorService.delete(idDto.getId()); |
| 450 | return result ; | 442 | return result ; |
| 451 | } | 443 | } |
| 452 | 444 |
src/main/java/com/sincere/student/mapper/MajorMapper.java
src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java
| @@ -50,7 +50,9 @@ public class MajorServiceImpl implements MajorService { | @@ -50,7 +50,9 @@ public class MajorServiceImpl implements MajorService { | ||
| 50 | 50 | ||
| 51 | @Override | 51 | @Override |
| 52 | public int delete(int id) { | 52 | public int delete(int id) { |
| 53 | - return majorMapper.delete(id); | 53 | + majorMapper.delete(id); |
| 54 | + majorMapper.deleteByPid(id); | ||
| 55 | + return 1; | ||
| 54 | } | 56 | } |
| 55 | 57 | ||
| 56 | @Override | 58 | @Override |
src/main/resources/mapper/MajorMapper.xml
| @@ -43,6 +43,10 @@ | @@ -43,6 +43,10 @@ | ||
| 43 | delete university_major where id = #{id} | 43 | delete university_major where id = #{id} |
| 44 | </delete> | 44 | </delete> |
| 45 | 45 | ||
| 46 | + <delete id="deleteByPid" parameterType="java.lang.Integer"> | ||
| 47 | + delete university_major where p_id = #{id} | ||
| 48 | + </delete> | ||
| 49 | + | ||
| 46 | <update id="update" parameterType="com.sincere.student.model.Major"> | 50 | <update id="update" parameterType="com.sincere.student.model.Major"> |
| 47 | update university_major | 51 | update university_major |
| 48 | <trim prefix="set" suffixOverrides=","> | 52 | <trim prefix="set" suffixOverrides=","> |