Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

src/main/java/com/template/controller/WelcomeBedController.java

@@ -449,7 +449,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             return CommonResult.fail("第" + h + "行,不存在该院系");
                         }
 
-                        Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major)).findFirst();
+//                        专业
+                        Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major) && e.getParentId().equals(owo.get().getId())).findFirst();
                         if (omwo != null && omwo.isPresent()) {
                             bedData.setMajor(major);
                             bedData.setMajorId(omwo.get().getId());
@@ -458,7 +459,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             return CommonResult.fail("第" + h + "行,不存在该专业");
                         }
 
-                        Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr)).findFirst();
+//                        班级
+                        Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr)  && e.getParentId().equals(omwo.get().getId())).findFirst();
                         if (ocwo != null && ocwo.isPresent()) {
                             bedData.setClassstr(classstr);
                             bedData.setClassstrId(ocwo.get().getId());
@@ -642,7 +644,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             return CommonResult.fail("第" + h + "行,不存在该院系");
                         }
 
-                        Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major)).findFirst();
+//                        专业
+                        Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major) && e.getParentId().equals(owo.get().getId())).findFirst();
                         if (omwo != null && omwo.isPresent()) {
                             bedData.setMajor(major);
                             bedData.setMajorId(omwo.get().getId());
@@ -651,7 +654,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             return CommonResult.fail("第" + h + "行,不存在该专业");
                         }
 
-                        Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr)).findFirst();
+//                        班级
+                        Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr)  && e.getParentId().equals(omwo.get().getId())).findFirst();
                         if (ocwo != null && ocwo.isPresent()) {
                             bedData.setClassstr(classstr);
                             bedData.setClassstrId(ocwo.get().getId());

src/main/java/com/template/controller/WelcomeRoleController.java

@@ -10,6 +10,7 @@ import com.template.model.pojo.WelcomeRole;
 import com.template.model.pojo.WelcomeSchool;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.RoleGroupVo;
 import com.template.services.WelcomeAccountService;
 import com.template.services.WelcomeRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +18,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -88,6 +92,7 @@ public class WelcomeRoleController implements WelcomeRoleControllerAPI {
     @Override
     public CommonResult roleGroup() {
         List<WelcomeRole> welcomeRoles=welcomeRoleService.roleGroup();
+
         return CommonResult.ok(welcomeRoles);
     }
 }

src/main/java/com/template/model/vo/RoleGroupVo.java

@@ -0,0 +1,29 @@
+package com.template.model.vo;
+
+import com.template.model.pojo.WelcomeRole;
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class RoleGroupVo {
+    /**
+     * 数据ID
+     */
+    private int id;
+
+    /**
+     * 父级ID
+     */
+    private int parentId;
+
+    /**
+     * 部门名称
+     */
+    private String roldName;
+
+
+    /**
+     * 子级部门
+     */
+    private List<RoleGroupVo> children;
+}