diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSkillController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSkillController.java index 174812e..eb1eb51 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSkillController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSkillController.java @@ -120,9 +120,13 @@ public class AppSkillController extends BaseController * 删除标签信息 */ @Log(title = "标签信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) + @DeleteMapping("/{id}") + public AjaxResult remove(@PathVariable Long id) { - return toAjax(appSkillService.deleteAppSkillByIds(ids)); + + if (appSkillService.hasChildById(id)) { + return AjaxResult.error(2001,"存在子集数据,不允许删除"); + } + return toAjax(appSkillService.deleteAppSkillByIds(id)); } } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppSkillMapper.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppSkillMapper.java index 1c10d9f..50ec27f 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppSkillMapper.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppSkillMapper.java @@ -58,4 +58,6 @@ public interface AppSkillMapper * @return 结果 */ public int deleteAppSkillByIds(Long[] ids); + + int hasChildById(Long id); } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppSkillService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppSkillService.java index a35eabb..1749570 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppSkillService.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppSkillService.java @@ -50,7 +50,7 @@ public interface IAppSkillService * @param ids 需要删除的标签信息主键集合 * @return 结果 */ - public int deleteAppSkillByIds(Long[] ids); + public int deleteAppSkillByIds(Long ids); /** * 删除标签信息信息 @@ -64,4 +64,6 @@ public interface IAppSkillService List skillList(AppSkill appSkill); + + boolean hasChildById(Long id); } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppSkillServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppSkillServiceImpl.java index 6b1d545..80e8557 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppSkillServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppSkillServiceImpl.java @@ -87,9 +87,9 @@ public class AppSkillServiceImpl implements IAppSkillService * @return 结果 */ @Override - public int deleteAppSkillByIds(Long[] ids) + public int deleteAppSkillByIds(Long id) { - return appSkillMapper.deleteAppSkillByIds(ids); + return appSkillMapper.deleteAppSkillById(id); } /** @@ -136,4 +136,10 @@ public class AppSkillServiceImpl implements IAppSkillService } return appSkillVos; } + + @Override + public boolean hasChildById(Long id) { + int i = appSkillMapper.hasChildById(id); + return i > 0; + } } diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppSkillMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppSkillMapper.xml index 38306c4..143c89c 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppSkillMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppSkillMapper.xml @@ -84,4 +84,8 @@ #{id} + + \ No newline at end of file