Commit 2e326f0f authored by zhangsen's avatar zhangsen

修改bug

parent 42e98d7d
...@@ -28,6 +28,7 @@ public class OrgMenuDto { ...@@ -28,6 +28,7 @@ public class OrgMenuDto {
private String bizOrgType; private String bizOrgType;
private String bizOrgCode; private String bizOrgCode;
private Long total; private Long total;
private String code;
public Boolean getLeaf() { public Boolean getLeaf() {
return ObjectUtils.isEmpty(children); return ObjectUtils.isEmpty(children);
...@@ -45,6 +46,17 @@ public class OrgMenuDto { ...@@ -45,6 +46,17 @@ public class OrgMenuDto {
return title; return title;
} }
public OrgMenuDto(Long key, String title, Long parentId, String bizOrgType, boolean leaf, String bizOrgCode, String code) {
super();
this.key = key;
this.title = title;
this.parentId = parentId;
this.bizOrgType = bizOrgType;
this.leaf = leaf;
this.bizOrgCode = bizOrgCode;
this.code = code;
}
public OrgMenuDto(Long key, String title, Long parentId, String bizOrgType, boolean leaf, String bizOrgCode) { public OrgMenuDto(Long key, String title, Long parentId, String bizOrgType, boolean leaf, String bizOrgCode) {
super(); super();
this.key = key; this.key = key;
......
...@@ -164,7 +164,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -164,7 +164,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
List<OrgMenuDto> menuList = list.stream() List<OrgMenuDto> menuList = list.stream()
.map(o -> new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(), .map(o -> new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.parseLong(o.getParentId()), o.getBizOrgType(), ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.parseLong(o.getParentId()), o.getBizOrgType(),
false, o.getBizOrgCode()).setTotal(o.getTotal())) false, o.getBizOrgCode(), o.getCode()).setTotal(o.getTotal()))
.collect(Collectors.toList()); .collect(Collectors.toList());
List<OrgMenuDto> result = new ArrayList<>(); List<OrgMenuDto> result = new ArrayList<>();
Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size()); Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment