From fb937034a70c7a8b2b3717f840645dc1aa7c24ef Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Fri, 17 Apr 2020 07:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BC=E5=84=BF=E5=9B=AD=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/dept/index.vue      |  5 +++-
 .../system/controller/BySchoolController.java | 23 +++++++++++++++++++
 .../mybatis/system/SysDeptMapper.xml          |  4 ++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue
index a652aa928..e5e727a4b 100644
--- a/ruoyi-ui/src/views/system/dept/index.vue
+++ b/ruoyi-ui/src/views/system/dept/index.vue
@@ -57,6 +57,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.parentId != 200"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -64,6 +65,7 @@
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
           <el-button
+            v-if="scope.row.deptId < 200"
             size="mini"
             type="text"
             icon="el-icon-plus"
@@ -71,7 +73,7 @@
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
           <el-button
-            v-if="scope.row.parentId != 0"
+            v-if="scope.row.parentId != 0 && scope.row.parentId != 200"
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -158,6 +160,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      sh: false,
       // 遮罩层
       loading: true,
       // 表格树数据
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java
index 3f4dd0a5b..06f3d0e06 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java
@@ -147,6 +147,29 @@ public class BySchoolController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
+        //遍历ids
+        for (int i=0;i<ids.length;i++)
+        {
+            //循环找出school表的id
+            Long bySchId = ids[i];
+            //用school表ID获取xxdm的值
+            //将值赋给dept中的schoolID
+            SysDept dept = new SysDept();
+            dept.setSchoolId(bySchoolService.selectBySchoolById(bySchId).getXxdm());
+            //通过dept表的schoolID来找出dept的List
+            deptService.deleteDeptById(deptService.selectDeptList(dept).get(0).getDeptId());
+    }
         return toAjax(bySchoolService.deleteBySchoolByIds(ids));
     }
 }
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
index 22de8ac16..ecfbd657b 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
@@ -40,6 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="status != null and status != ''">
 			AND status = #{status}
 		</if>
+		<if test="schoolId != null and schoolId != ''">
+			AND school_id = #{schoolId}
+		</if>
 		<!-- 数据范围过滤 -->
 		${dataScope}
 		order by d.parent_id, d.order_num
@@ -152,4 +155,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
 
+
 </mapper> 
\ No newline at end of file