修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -92,7 +92,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size());
         menuList.forEach(e -> map.put(e.getKey(), e));
         Set<? extends Map.Entry<Long, ? extends OrgMenuDto>> entries = map.entrySet();
-        entries.parallelStream().forEach(entry -> {
+        //此处多线程，会value 出现null 的情况
+        //entries.parallelStream().forEach(entry -> {
+            entries.stream().forEach(entry -> {
             OrgMenuDto value = entry.getValue();
             if (value != null) {
                 OrgMenuDto treeDto = map.get(value.getParentId());
@@ -102,6 +104,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                         children = new ArrayList<>();
                         treeDto.setChildren(children);
                     }
+
                     children.add(value);
                 } else {
                     result.add(value);

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -1145,4 +1145,18 @@
 		</sql>
 	</changeSet>
 
+
+
+	<changeSet author="tw" id="2021-09-22-0002">
+		<preConditions onFail="MARK_RAN">
+			<tableExists tableName="cb_firefighters"/>
+		</preConditions>
+		<comment>增加amos账号关联字段</comment>
+		<sql>
+			ALTER TABLE `cb_firefighters` add amos_name varchar(255) COMMENT 'amos账户名称';
+			ALTER TABLE `cb_firefighters` add amos_user_id varchar(255) COMMENT 'amos账户id';
+		</sql>
+	</changeSet>
+
+
 </databaseChangeLog>