bug 修复

陈杰
1 parent 1ad1148e
Showing 4 changed files with 10 additions and 10 deletions Show diff stats
src/main/java/com/sincere/student/controller/AdminController.java
src/main/java/com/sincere/student/mapper/MajorMapper.java
src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java
src/main/resources/mapper/MajorMapper.xml
@@ -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<Major> page = majorService.getList(majorSearchDto);
-        if(page.getCount() == 0){
-            majorService.delete(idDto.getId());
-        }else {
-            result.setSuccess(false);
-            result.setMessage("还有下级专业，删除失败");
-        }
+        majorService.delete(idDto.getId());
         return result ;
     }
  
@@ -16,5 +16,7 @@ public interface MajorMapper {
  
     int delete(int id);
  
+    int deleteByPid(int id);
+
     List<Major> selectMajor();
 }
@@ -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
@@ -43,6 +43,10 @@
         delete university_major where id = #{id}
     </delete>
  
+    <delete id="deleteByPid" parameterType="java.lang.Integer">
+        delete university_major where p_id = #{id}
+    </delete>
+
     <update id="update" parameterType="com.sincere.student.model.Major">
         update university_major
         <trim prefix="set" suffixOverrides=",">
...	...	@@ -438,15 +438,7 @@ public class AdminController {
438	438	@RequestMapping(value = "/major/delete" , method = RequestMethod.POST)
439	439	public BaseDto deleteMajor(@RequestBody IdDto idDto){
440	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	442	return result ;
451	443	}
452	444
...	...
...	...	@@ -16,5 +16,7 @@ public interface MajorMapper {
16	16
17	17	int delete(int id);
18	18
	19	+ int deleteByPid(int id);
	20	+
19	21	List<Major> selectMajor();
20	22	}
...	...
...	...	@@ -50,7 +50,9 @@ public class MajorServiceImpl implements MajorService {
50	50
51	51	@Override
52	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	58	@Override
...	...
...	...	@@ -43,6 +43,10 @@
43	43	delete university_major where id = #{id}
44	44	</delete>
45	45
	46	+ <delete id="deleteByPid" parameterType="java.lang.Integer">
	47	+ delete university_major where p_id = #{id}
	48	+ </delete>
	49	+
46	50	<update id="update" parameterType="com.sincere.student.model.Major">
47	51	update university_major
48	52	<trim prefix="set" suffixOverrides=",">
...	...