From 1f202f8348177df389bc47ef25723857dc01961c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 4 Mar 2020 12:54:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=20=20=20=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=81=8C=E8=B4=A3=E5=88=86=E7=B1=BB=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E8=A2=AB=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consult/service/GridOperatorInfoService.java      |  9 +++++++++
 .../impl/GridOperatorDutyCategoryServiceImpl.java     |  9 +++++++++
 .../service/impl/GridOperatorInfoServiceImpl.java     | 11 +++++++++++
 3 files changed, 29 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/GridOperatorInfoService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/GridOperatorInfoService.java
index a8215fc00..5d79c55b8 100755
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/GridOperatorInfoService.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/GridOperatorInfoService.java
@@ -123,4 +123,13 @@ public interface GridOperatorInfoService extends BaseService<GridOperatorInfoEnt
      * @date 2020/3/3 9:52
      */
     Result<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto);
+
+    /***
+     * 判断网格员职责类别下是够被关联
+     * @param
+     * @return boolean
+     * @author qushutong
+     * @date 2020/3/4 12:43
+     */
+    boolean isExistsByDutyId(String dutyCategoryId);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java
index 91825c38b..27e339af9 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java
@@ -20,14 +20,17 @@ package com.elink.esua.epdc.modules.consult.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dto.consult.GridOperatorDutyCategoryDTO;
+import com.elink.esua.epdc.dto.consult.GridOperatorInfoDTO;
 import com.elink.esua.epdc.modules.consult.dao.GridOperatorDutyCategoryDao;
 import com.elink.esua.epdc.modules.consult.entity.GridOperatorDutyCategoryEntity;
 import com.elink.esua.epdc.modules.consult.redis.GridOperatorDutyCategoryRedis;
 import com.elink.esua.epdc.modules.consult.service.GridOperatorDutyCategoryService;
+import com.elink.esua.epdc.modules.consult.service.GridOperatorInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -49,6 +52,8 @@ public class GridOperatorDutyCategoryServiceImpl extends BaseServiceImpl<GridOpe
     @Autowired
     private GridOperatorDutyCategoryRedis gridOperatorDutyCategoryRedis;
 
+    @Autowired
+    private GridOperatorInfoService gridOperatorInfoService;
     @Override
     public PageData<GridOperatorDutyCategoryDTO> page(Map<String, Object> params) {
         IPage<GridOperatorDutyCategoryEntity> page = baseDao.selectPage(
@@ -98,6 +103,10 @@ public class GridOperatorDutyCategoryServiceImpl extends BaseServiceImpl<GridOpe
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
         // 逻辑删除（@TableLogic 注解）
+        boolean existsByDutyId = gridOperatorInfoService.isExistsByDutyId(ids[0]);
+        if(existsByDutyId){
+            throw new RenException("此网格员职责类别已被绑定，不允许删除");
+        }
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java
index d1cff52ad..64ed04997 100755
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java
@@ -168,4 +168,15 @@ public class GridOperatorInfoServiceImpl extends BaseServiceImpl<GridOperatorInf
         return new Result<List<GridOperatorListResultDTO>>().ok(list);
     }
 
+    @Override
+    public boolean isExistsByDutyId(String dutyCategoryId) {
+        QueryWrapper queryWrapper= new QueryWrapper();
+        queryWrapper.eq(StringUtils.isNotBlank(dutyCategoryId),"DUTY_CATEGORY_ID",dutyCategoryId);
+        Integer integer = baseDao.selectCount(queryWrapper);
+        if(integer>0){
+            return true;
+        }
+        return false;
+    }
+
 }
\ No newline at end of file