修改代码

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

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -68,7 +69,9 @@ public class OrgUsrAgencyUserServiceImpl extends BaseService<OrgUsrAgencyUserDto
             if (!ObjectUtils.isEmpty(orgUsr1) && !orgUsr1.getIsDelete()) {
                 orgUsr1.setAmosOrgId(object.get("userId").toString());
                 List<Map<String, Object>> companys = (List<Map<String, Object>>) object.get("companys");
+               if (!ObjectUtils.isEmpty(companys)){
                    orgUsr1.setAmosOrgCode(companys.get(0).get("orgCode").toString());
+               }
                 orgUsrMapper.update(orgUsr1,new QueryWrapper<OrgUsr>().eq("sequence_nbr",orgUsrAgencyUser.getOrgUsrId()));
             }
         } else if ("multDeleteUser".equals(methodName)) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1389,7 +1389,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         return companyList.stream().filter(a -> companyList.stream().noneMatch(c -> c.getId().toString().equals(a.getParentId())))
                 .peek(b -> {
                     b.setChildren(getCompanyBuildingChildrenTree(b.getId().toString(), companyList));
-                    b.setTotal(b.getChildren().stream().filter(c -> c.getTotal() != null).mapToLong(BuildingTreeVo::getTotal).sum() + b.getTotal());
+                    b.setTotal(b.getChildren().stream().filter(c -> c.getTotal() != null).mapToLong(BuildingTreeVo::getTotal).sum());
                 }).collect(Collectors.toList());
 
     }