diff --git a/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelClassificationController.java b/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelClassificationController.java index 2320823..24d7a18 100644 --- a/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelClassificationController.java +++ b/bonus-business/src/main/java/com/bonus/digital/controller/PersonnelClassificationController.java @@ -71,9 +71,11 @@ public class PersonnelClassificationController extends BaseController { { try { int res = personnelClassificationService.delClassification(personnelClassificationVo); - if (res > 0) { + if (res == 1) { return AjaxResult.success(); - }else { + } else if (res == 2) { + return AjaxResult.error("已绑定人员请勿删除"); + } else { return AjaxResult.error("删除失败"); } }catch (Exception e) { diff --git a/bonus-business/src/main/java/com/bonus/digital/mapper/PersonnelMapper.java b/bonus-business/src/main/java/com/bonus/digital/mapper/PersonnelMapper.java index 56662c0..86b271a 100644 --- a/bonus-business/src/main/java/com/bonus/digital/mapper/PersonnelMapper.java +++ b/bonus-business/src/main/java/com/bonus/digital/mapper/PersonnelMapper.java @@ -1,5 +1,6 @@ package com.bonus.digital.mapper; +import com.bonus.digital.dao.PersonnelClassificationVo; import com.bonus.digital.dao.PersonnelVo; import com.bonus.digital.dao.SelectDto; import org.apache.ibatis.annotations.Param; @@ -31,4 +32,6 @@ public interface PersonnelMapper { List getInspectionStationSelect(@Param("category") String category); List getPersonnelClassificationSelect(@Param("category") String category); + + List getPersonnelListByClassificationId(PersonnelClassificationVo personnelClassificationVo); } diff --git a/bonus-business/src/main/java/com/bonus/digital/service/impl/PersonnelClassificationServiceImpl.java b/bonus-business/src/main/java/com/bonus/digital/service/impl/PersonnelClassificationServiceImpl.java index a64fd7f..2d12584 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/impl/PersonnelClassificationServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/impl/PersonnelClassificationServiceImpl.java @@ -2,7 +2,9 @@ package com.bonus.digital.service.impl; import com.bonus.common.utils.SecurityUtils; import com.bonus.digital.dao.PersonnelClassificationVo; +import com.bonus.digital.dao.PersonnelVo; import com.bonus.digital.mapper.PersonnelClassificationMapper; +import com.bonus.digital.mapper.PersonnelMapper; import com.bonus.digital.service.PersonnelClassificationService; import lombok.extern.log4j.Log4j; import lombok.extern.slf4j.Slf4j; @@ -24,6 +26,9 @@ public class PersonnelClassificationServiceImpl implements PersonnelClassificati @Resource private PersonnelClassificationMapper personnelClassificationMapper; + @Resource + private PersonnelMapper personnelMapper; + /** * 获取0:人员分类1:人员性质2:岗位列表 */ @@ -49,6 +54,10 @@ public class PersonnelClassificationServiceImpl implements PersonnelClassificati */ @Override public int delClassification(PersonnelClassificationVo personnelClassificationVo) { + List personnelVoList = personnelMapper.getPersonnelListByClassificationId(personnelClassificationVo); + if (!personnelVoList.isEmpty()){ + return 2; + } return personnelClassificationMapper.delClassification(personnelClassificationVo); } diff --git a/bonus-business/src/main/resources/mapper/PersonnalMapper.xml b/bonus-business/src/main/resources/mapper/PersonnalMapper.xml index 45f4318..5c72831 100644 --- a/bonus-business/src/main/resources/mapper/PersonnalMapper.xml +++ b/bonus-business/src/main/resources/mapper/PersonnalMapper.xml @@ -109,4 +109,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" personnel_classification_name as value from tb_personnel_classification where is_active = '1' and category = #{category} +