From 7b5f800347cbb7f2226ba9e417ac973a5663c298 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Sat, 6 Jan 2024 16:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=81=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicsskill/controller/BasicsskillController.java | 11 +++++++++--
 .../modules/demo/basicsskill/entity/Basicsskill.java  |  6 ++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
index 431e62b4..460c034d 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
@@ -82,8 +82,8 @@ public class BasicsskillController extends JeecgController<Basicsskill, IBasicss
             }
             basicsskill.setPid(null);
             QueryWrapper<Basicsskill> queryWrapper = QueryGenerator.initQueryWrapper(basicsskill, req.getParameterMap());
-            // 使用 eq 防止模糊查询
-            //queryWrapper.eq("pid", parentId);
+            // 使用 in 防止模糊查询
+            queryWrapper.in("pid", "0","1");
             Page<Basicsskill> page = new Page<Basicsskill>(pageNo, pageSize);
             IPage<Basicsskill> pageList = basicsskillService.page(page, queryWrapper);
 			for(Basicsskill basicsskill1:pageList.getRecords()){
@@ -233,6 +233,13 @@ public class BasicsskillController extends JeecgController<Basicsskill, IBasicss
    // @RequiresPermissions("basicsskill:basicsskill:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody Basicsskill basicsskill) {
+		if(basicsskill.getPid().equals("专业认证能力评价体系")){
+			basicsskill.setPid("0");
+		}else if(basicsskill.getPid().equals("创新能力评价体系")){
+			basicsskill.setPid("1");
+		}else {
+			basicsskill.setPid(basicsskillService.getById(basicsskill.getId()).getPid());
+		}
 		basicsskillService.updateBasicsskill(basicsskill);
 		return Result.OK("编辑成功!");
 	}
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/entity/Basicsskill.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/entity/Basicsskill.java
index 9a5d056e..2cd40fa8 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/entity/Basicsskill.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/entity/Basicsskill.java
@@ -68,4 +68,10 @@ public class Basicsskill implements Serializable {
 	@Dict(dicCode = "yn")
     @ApiModelProperty(value = "是否有子节点")
     private String hasChild;
+    /**
+     * 启停
+     */
+    @Excel(name = "启停", width = 15)
+    @ApiModelProperty(value = "启停")
+    private String startstop;
 }