fix 委员履职信息详细信息

ruoyi-system/src/main/java/com/ruoyi/system/domain/member/MemberInfoTree.java

@@ -14,29 +14,30 @@ public class MemberInfoTree implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /** 节点ID */
-    private String id;
+    private String userId;
 
     /** 节点名称 */
-    private String label;
+    private String name;
 
     /** 子节点 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<MemberInfo> children;
 
-    public String getId() {
-        return id;
+
+    public String getUserId() {
+        return userId;
     }
 
-    public void setId(String id) {
-        this.id = id;
+    public void setUserId(String userId) {
+        this.userId = userId;
     }
 
-    public String getLabel() {
-        return label;
+    public String getName() {
+        return name;
     }
 
-    public void setLabel(String label) {
-        this.label = label;
+    public void setName(String name) {
+        this.name = name;
     }
 
     public List<MemberInfo> getChildren() {

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MemberInfoServiceImpl.java

@@ -106,13 +106,13 @@ public class MemberInfoServiceImpl implements IMemberInfoService
             if (dictDataList !=null && dictDataList.size() >0){
                 for (SysDictData sysDictData : dictDataList) {
                     MemberInfoTree memberInfoTree = new MemberInfoTree();
-                    memberInfoTree.setId(sysDictData.getDictValue());
-                    memberInfoTree.setLabel(sysDictData.getDictLabel());
+                    memberInfoTree.setUserId(sysDictData.getDictValue());
+                    memberInfoTree.setName(sysDictData.getDictLabel());
                     memberInfoTreeList.add(memberInfoTree);
                 }
                 for (MemberInfoTree memberInfoTree : memberInfoTreeList) {
                     //委员级别id
-                    String id = memberInfoTree.getId();
+                    String id = memberInfoTree.getUserId();
                     List<MemberInfo> memberInfoList = new ArrayList<>();
                     for (MemberInfo info : memberInfo) {
                         if (info.getGrade().contains(id)){