diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareDetailVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareDetailVO.java index d93762946..f5508600c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareDetailVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareDetailVO.java @@ -12,9 +12,9 @@ public class SarFileCompareDetailVO { private String fileNameRight; private String remark; private String comments; - private SarFileCompareMenuVo menuLeft; + private List menuLeft; private List textLeft; - private SarFileCompareMenuVo menuRight; + private List menuRight; private List textRight; public String getInfoId() { @@ -73,14 +73,6 @@ public class SarFileCompareDetailVO { this.comments = comments; } - public SarFileCompareMenuVo getMenuLeft() { - return menuLeft; - } - - public void setMenuLeft(SarFileCompareMenuVo menuLeft) { - this.menuLeft = menuLeft; - } - public List getTextLeft() { return textLeft; } @@ -96,14 +88,6 @@ public class SarFileCompareDetailVO { this.textLeft.add(text); } - public SarFileCompareMenuVo getMenuRight() { - return menuRight; - } - - public void setMenuRight(SarFileCompareMenuVo menuRight) { - this.menuRight = menuRight; - } - public List getTextRight() { return textRight; } @@ -118,4 +102,34 @@ public class SarFileCompareDetailVO { } this.textRight.add(text); } + + public List getMenuLeft() { + return menuLeft; + } + + public void setMenuLeft(List menuLeft) { + this.menuLeft = menuLeft; + } + + public void addMenuLeft(SarFileCompareMenuVo menu) { + if (this.menuLeft == null) { + this.menuLeft = new ArrayList<>(); + } + this.menuLeft.add(menu); + } + + public List getMenuRight() { + return menuRight; + } + + public void setMenuRight(List menuRight) { + this.menuRight = menuRight; + } + + public void addMenuRight(SarFileCompareMenuVo menu) { + if (this.menuRight == null) { + this.menuRight = new ArrayList<>(); + } + this.menuRight.add(menu); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java index 18cee5103..669f9a217 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java @@ -4,11 +4,15 @@ import java.util.ArrayList; import java.util.List; public class SarFileCompareMenuVo extends SarFileCompareMenu { + private String key; + private String title; + private List children; public SarFileCompareMenuVo(SarFileCompareMenu menu) { super(); this.setId(menu.getId()); + this.setKey(menu.getId()); this.setCreateBy(menu.getCreateBy()); this.setCreateTime(menu.getCreateTime()); this.setUpdateBy(menu.getUpdateBy()); @@ -17,6 +21,7 @@ public class SarFileCompareMenuVo extends SarFileCompareMenu { this.setMenuId(menu.getMenuId()); this.setInfoId(menu.getInfoId()); this.setName(menu.getName()); + this.setTitle(menu.getName()); this.setParentId(menu.getParentId()); this.setDisplaySeq(menu.getDisplaySeq()); this.setLeftOrRight(menu.getLeftOrRight()); @@ -38,4 +43,20 @@ public class SarFileCompareMenuVo extends SarFileCompareMenu { } children.add(child); } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index d6d8b299f..62fba4c09 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -267,14 +267,14 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl 0 && sfVo.getMenuLeft() != null && sfVo.getMenuLeft().size() > 0) { break; } }