Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -18,7 +18,7 @@ public class SqlFilter {
|
|||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
str = StringUtils.replace(str, "\\n", "Line_Break");
|
str = StringUtils.replace(str, "\\n", "Line_Break");
|
||||||
String[] keywords = new String[]{"master", "truncate", "insert", "select", "delete", "update", "declare", "alter", "drop"};
|
String[] keywords = new String[]{"truncate", "insert", "select", "delete", "update", "declare", "alter", "drop"};
|
||||||
String[] var2 = keywords;
|
String[] var2 = keywords;
|
||||||
int var3 = keywords.length;
|
int var3 = keywords.length;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -65,7 +65,7 @@ public class LawsPartNameController {
|
|||||||
@AutoLog(value = "企业标准-获取子集")
|
@AutoLog(value = "企业标准-获取子集")
|
||||||
@ApiOperation(value = "企业标准-获取子集", notes = "企业标准-获取子集")
|
@ApiOperation(value = "企业标准-获取子集", notes = "企业标准-获取子集")
|
||||||
@GetMapping("/getChild")
|
@GetMapping("/getChild")
|
||||||
public Result<List<PartName>> getChild(@RequestParam("dictItemId") String parentCode,
|
public Result<List<PartName>> getChild(@RequestParam("parentCode") String parentCode,
|
||||||
@RequestParam("nodeName") String nodeName) {
|
@RequestParam("nodeName") String nodeName) {
|
||||||
return Result.OK(IPartNameService.getChild(parentCode, nodeName));
|
return Result.OK(IPartNameService.getChild(parentCode, nodeName));
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -215,7 +215,7 @@ public class PartNameServiceImpl extends ServiceImpl<PartNameMapper, PartName>
|
|||||||
@Override
|
@Override
|
||||||
public List<PartName> getChild(String parentCode, String nodeName) {
|
public List<PartName> getChild(String parentCode, String nodeName) {
|
||||||
LambdaQueryWrapper<PartName> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<PartName> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
queryWrapper.eq(PartName::getParentCode, "Part");
|
queryWrapper.eq(PartName::getParentCode, parentCode);
|
||||||
if (nodeName != null && !nodeName.isEmpty()) {
|
if (nodeName != null && !nodeName.isEmpty()) {
|
||||||
queryWrapper.like(PartName::getName, nodeName);
|
queryWrapper.like(PartName::getName, nodeName);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user