From 3dbe1e5003720d85f02b0fc2e7a20cb29e3b9948 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Fri, 23 Oct 2020 17:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=86=85=E5=AE=B9=E9=83=A8?=
=?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/benyi/assessmentcontent/index.vue | 47 ++++---------------
.../ByAssessmentcontentController.java | 9 ++--
.../mapper/ByAssessmentcontentMapper.java | 8 ++++
.../service/IByAssessmentcontentService.java | 8 ++++
.../impl/ByAssessmentcontentServiceImpl.java | 12 +++++
.../benyi/ByAssessmentcontentMapper.xml | 5 ++
6 files changed, 48 insertions(+), 41 deletions(-)
diff --git a/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue b/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
index 65bcc9a40..67ac0d52c 100644
--- a/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
+++ b/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
@@ -23,14 +23,6 @@
@click="handleQuery"
>搜索
- 重置
-
-
-
-
-
新增
-
-
- 修改重置
-
-
- 删除
-
-
+
+
-
修改
{
- // this.assessmentcontentList = response.rows;
this.assessmentcontentList = this.handleTree(response.rows, "id");
- //console.log(this.assessmentcontentList);
this.total = response.total;
this.loading = false;
});
@@ -263,7 +235,6 @@ export default {
getTreeselect() {
listAssessmentcontent(null).then((response) => {
this.parentidOptions = this.handleTree(response.rows, "id");
- console.log(this.parentidOptions);
});
},
@@ -329,6 +300,7 @@ export default {
const id = row.id || this.ids;
getAssessmentcontent(id).then((response) => {
this.form = response.data;
+ this.form.parentId = response.data.parentId;
this.open = true;
this.title = "修改评估内容";
});
@@ -359,9 +331,8 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
- const ids = row.id || this.ids;
this.$confirm(
- '是否确认删除评估内容的数据项?',
+ '是否确认删除名称为"' + row.name + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
@@ -370,7 +341,7 @@ export default {
}
)
.then(function () {
- return delAssessmentcontent(ids);
+ return delAssessmentcontent(row.id);
})
.then(() => {
this.getList();
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java
index 677575647..e78c38198 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java
@@ -113,9 +113,12 @@ public class ByAssessmentcontentController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:remove')")
@Log(title = "评估内容", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
+ @DeleteMapping("/{id}")
+ public AjaxResult remove(@PathVariable Long id)
{
- return toAjax(byAssessmentcontentService.deleteByAssessmentcontentByIds(ids));
+ if (byAssessmentcontentService.hasChildByAssessmentcontentId(id)) {
+ return AjaxResult.error("存在下级内容,不允许删除");
+ }
+ return toAjax(byAssessmentcontentService.deleteByAssessmentcontentById(id));
}
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java
index ff1c65987..c54320d8f 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java
@@ -58,4 +58,12 @@ public interface ByAssessmentcontentMapper {
* @return 结果
*/
public int deleteByAssessmentcontentByIds(Long[] ids);
+
+ /**
+ * 是否存在子节点
+ *
+ * @param id 内容ID
+ * @return 结果
+ */
+ public int hasChildByAssessmentcontentId(Long id);
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java
index 639d01098..f78022ca2 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java
@@ -60,6 +60,14 @@ public interface IByAssessmentcontentService {
*/
public int updateByAssessmentcontent(ByAssessmentcontent byAssessmentcontent);
+ /**
+ * 是否存在内容子节点
+ *
+ * @param id 部门ID
+ * @return 结果
+ */
+ public boolean hasChildByAssessmentcontentId(Long id);
+
/**
* 批量删除评估内容
*
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java
index 339681ae2..ad0bfaedf 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java
@@ -108,6 +108,18 @@ public class ByAssessmentcontentServiceImpl implements IByAssessmentcontentServi
return byAssessmentcontentMapper.updateByAssessmentcontent(byAssessmentcontent);
}
+ /**
+ * 是否存在子节点
+ *
+ * @param id 内容ID
+ * @return 结果
+ */
+ @Override
+ public boolean hasChildByAssessmentcontentId(Long id) {
+ int result = byAssessmentcontentMapper.hasChildByAssessmentcontentId(id);
+ return result > 0 ? true : false;
+ }
+
/**
* 批量删除评估内容
*
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
index 28d682b42..8e3cf6d46 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
@@ -33,6 +33,11 @@
where id = #{id}
+
+
insert into by_assessmentcontent