From cf32d2292716ed76083ed54d2ddbd9e82300c4ef Mon Sep 17 00:00:00 2001
From: "yangyang.wang@dhc.com.cn" <yangyang.wang@dhc.com.cn>
Date: Thu, 1 Aug 2024 10:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/dhc/DhcAreaController.java | 12 ++++++----
 .../common/core/domain/entity/DhcArea.java    | 12 ++++++++++
 .../ruoyi/dhc/mapper/SysUserRoleMapper.java   | 23 -------------------
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/dhc/DhcAreaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/dhc/DhcAreaController.java
index 735d448..c6e905d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/dhc/DhcAreaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/dhc/DhcAreaController.java
@@ -102,11 +102,15 @@ public class DhcAreaController extends BaseController
      * 删除区域
      */
     @PreAuthorize("@ss.hasPermi('dhc:area:remove')")
-    @Log(title = "区域", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{areaIds}")
-    public AjaxResult remove(@PathVariable Long[] areaIds)
+	@GetMapping("/del/{areaId}")
+    public AjaxResult remove(@PathVariable("areaId") Long areaId)
     {
-        return toAjax(dhcAreaService.deleteDhcAreaByAreaIds(areaIds));
+        Integer count = dhcAreaService.deleteDhcAreaByAreaId(areaId);
+        if (count == -1) {
+            return AjaxResult.error("该区域存在子区域，请先删除子区域");
+        } else {
+            return AjaxResult.success();
+        }
     }
     /**
      * 查询区域信息
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/DhcArea.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/DhcArea.java
index a7f8854..bb62231 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/DhcArea.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/DhcArea.java
@@ -33,6 +33,10 @@ public class DhcArea extends BaseEntity
     @Excel(name = "区域名称")
     private String areaName;
 
+    /** 产品线 */
+    @Excel(name = "产品线")
+    private String productLineCode;
+
     /** 区域类型 */
     @Excel(name = "区域类型")
     private String areaType;
@@ -62,6 +66,14 @@ public class DhcArea extends BaseEntity
     /** 子部门 */
     private List<DhcArea> children = new ArrayList<DhcArea>();
 
+    public String getProductLineCode() {
+        return productLineCode;
+    }
+
+    public void setProductLineCode(String productLineCode) {
+        this.productLineCode = productLineCode;
+    }
+
     public String getParentName() {
         return parentName;
     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/dhc/mapper/SysUserRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/dhc/mapper/SysUserRoleMapper.java
index 3d44da4..753f53f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/dhc/mapper/SysUserRoleMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/dhc/mapper/SysUserRoleMapper.java
@@ -60,27 +60,4 @@ public interface SysUserRoleMapper
      * @return 结果
      */
     public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
-
-    /**
-     * 批量取消角色权限控制点
-     *
-     * @param roleId 角色ID
-     * @param authNodes 需要删除的角色权限控制点
-     * @return 结果
-     */
-    public int deleteRoleAuthNodesInfos(@Param("roleId") Long roleId, @Param("authNodes") String[] authNodes);
-    /**
-     * 批量角色权限控制点
-     *
-     * @param roleAuthNodeList 角色权限控制点列表
-     * @return 结果
-     */
-    public int batchRoleAuthNodes(List<DhcRoleAuthNode> roleAuthNodeList);
-    /**
-     * 根据条角色ID查询控制点信息
-     *
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    public List<String> getRoleAuthNodes(Long roleId);
 }