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 queryWrapper = QueryGenerator.initQueryWrapper(basicsskill, req.getParameterMap()); - // 使用 eq 防止模糊查询 - //queryWrapper.eq("pid", parentId); + // 使用 in 防止模糊查询 + queryWrapper.in("pid", "0","1"); Page page = new Page(pageNo, pageSize); IPage pageList = basicsskillService.page(page, queryWrapper); for(Basicsskill basicsskill1:pageList.getRecords()){ @@ -233,6 +233,13 @@ public class BasicsskillController extends JeecgController 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; }