ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into secondStage

Browse Source
This commit is contained in:
lijiarao
2023-12-06 15:29:36 +08:00
parent 09c4f87e8d 15c2189f07
commit 86dc8cb459
5 changed files with 177 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java
+15 -2
View File
@@ -112,12 +112,14 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
@Override
public void saveTreeNodeData(LawsTreeNode lawsTreeNode) {
if (lawsTreeNode != null) {
if (lawsTreeNode.getParentId() == null) {
String parentId = lawsTreeNode.getParentId();
if (parentId == null) {
lawsTreeNode.setParentId("");
}
// 对名称判重
LambdaQueryWrapper<LawsTreeNode> query = new LambdaQueryWrapper<>();
query.eq(LawsTreeNode::getNodeName, lawsTreeNode.getNodeName());
query.eq(LawsTreeNode::getParentId, parentId);
query.eq(LawsTreeNode::getModuleCode, lawsTreeNode.getModuleCode());
query.eq(LawsTreeNode::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
List<LawsTreeNode> lawsTreeNodes = this.list(query);
@@ -129,7 +131,6 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
lawsTreeNode.setId(s);
// 先判断该对象有无父级ID,有则意味着不是最高级,否则意味着是最高级
// 获取父级ID
String parentId = lawsTreeNode.getParentId();
String moduleCode = lawsTreeNode.getModuleCode();
//update-begin--Author:baihailong Date:20191209 for：部门编码规则生成器做成公用配置
JSONObject formData = new JSONObject();
@@ -149,6 +150,18 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
@Override
public boolean updateTreeNodeDataById(LawsTreeNode lawsTreeNode) {
if (lawsTreeNode != null) {
String parentId = lawsTreeNode.getParentId();
LambdaQueryWrapper<LawsTreeNode> query = new LambdaQueryWrapper<>();
query.eq(LawsTreeNode::getNodeName, lawsTreeNode.getNodeName());
query.eq(LawsTreeNode::getParentId, parentId);
query.eq(LawsTreeNode::getModuleCode, lawsTreeNode.getModuleCode());
query.eq(LawsTreeNode::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
query.ne(LawsTreeNode::getId,lawsTreeNode.getId());
List<LawsTreeNode> lawsTreeNodes = this.list(query);
if (lawsTreeNodes != null && !lawsTreeNodes.isEmpty()) {
//TODO 翻译
throw new JeroBootException("已存在名为" + lawsTreeNode.getNodeName() + "的节点");
}
this.updateById(lawsTreeNode);
return true;
} else {