多块牌子

ims-service/ims-eval/src/main/java/com/ims/eval/entity/MultipleBrand.java

@@ -26,9 +26,12 @@ public class MultipleBrand extends Model {
     /**
      * 主键id
      */
-    private String id;
-
+    private String id2;
 
+	/**
+	 * 公司id
+	 */
+	private String organizationId;
 
     /**
      * 主牌子name

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/MultipleBrandServiceImpl.java

@@ -53,7 +53,7 @@ public class MultipleBrandServiceImpl extends ServiceImpl<MultipleBrandMapper, M
 			return new ArrayList<>();
 		}
 		List<MultipleBrand> result = new ArrayList<>();
-		List<String> idList = brands.stream().map(MultipleBrand::getId).collect(Collectors.toList());
+		List<String> idList = brands.stream().map(MultipleBrand::getOrganizationId).collect(Collectors.toList());
 		// 设置最外层顶级
 		for (MultipleBrand brandsVO : brands) {
 			// 判断所有列表里面父级未在集合中放置到一级
@@ -78,7 +78,7 @@ public class MultipleBrandServiceImpl extends ServiceImpl<MultipleBrandMapper, M
 	 */
 	public static MultipleBrand getChildren(List<MultipleBrand> list, MultipleBrand treeSelectVO) {
 		for (MultipleBrand MultipleBrand : list) {
-			if (treeSelectVO.getId().equals(MultipleBrand.getParentId())) {
+			if (treeSelectVO.getOrganizationId().equals(MultipleBrand.getParentId())) {
 				List<MultipleBrand> children = CollectionUtil.isEmpty(treeSelectVO.getChildren()) ? new ArrayList<>() : treeSelectVO.getChildren();
 				children.add(getChildren(list, MultipleBrand));
 				treeSelectVO.setChildren(children);