bug xiugai1103

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

@@ -2852,7 +2852,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		Map<String, Object> param = new HashMap<>();
 		// 权限处理
 		PermissionInterceptorContext.setDataAuthRule(authKey);
-		param.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());
+		param.put("bizOrgCode", reginParams.getPersonIdentity().getCompanyBizOrgCode());
 		List<OrgUsr> list = orgUsrMapper.companyDeptListWithPersonCount(param);
 		return buildTreeParallel(list);
 	}

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

@@ -1562,7 +1562,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         //如果传递的为部门bizOrgCode 取其上级单位下的建筑
          ResponseModel<OrgUsrDto> companyByBizOrgCodeList = jcsFeign.getCompanyByBizOrgCodeList(bizOrgCode);
           String companyCode = companyByBizOrgCodeList.getResult().getBizOrgCode();
-        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true, bizOrgCode);
+        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true, companyCode);
         List<BuildingTreeVo> orgBuildingTreeVos = buildingTreeVos.stream().filter(b-> b.getBizOrgCode() != null && b.getBizOrgCode().startsWith(companyCode)).collect(Collectors.toList());
 
 
@@ -1577,7 +1577,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         //如果传递的为部门bizOrgCode 取其上级单位下的建筑
         ResponseModel<OrgUsrDto> companyByBizOrgCodeList = jcsFeign.getCompanyByBizOrgCodeList(bizOrgCode);
         String companyCode = companyByBizOrgCodeList.getResult().getBizOrgCode();
-        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true, bizOrgCode);
+        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true, companyCode);
         List<BuildingTreeVo> orgBuildingTreeVos = buildingTreeVos.stream().filter(b-> b.getBizOrgCode() != null && b.getBizOrgCode().startsWith(companyCode)).collect(Collectors.toList());
         return orgBuildingTreeVos;
     }

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

 package com.yeejoin.equipmanage.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.google.common.base.Joiner;
 import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
@@ -96,11 +92,11 @@ public class WarehouseStructureServiceImpl extends ServiceImpl<WarehouseStructur
                         one.eq("id",ids);
                     }
                 }
-                one.eq("warehouse_id", warehouseId);
+                one.eq("warehouse_id", 0);
                 list = warehouseStructureMapper.selectList(one);
             }
             QueryWrapper<WarehouseStructure> one1 = new QueryWrapper<>();
-            one1.eq("warehouse_id", warehouseId);
+            one1.eq("warehouse_id", 0);
             one1.eq("id", buildingId);
             list.addAll( warehouseStructureMapper.selectList(one1));
         }else {
@@ -110,7 +106,7 @@ public class WarehouseStructureServiceImpl extends ServiceImpl<WarehouseStructur
              list = warehouseStructureMapper.selectList(one);
 
         }
-        list = buildByRecursive(list, warehouseId);
+        list = buildByRecursiveTwo(list, warehouseId);
             return list;
     }
 
@@ -171,6 +167,30 @@ public class WarehouseStructureServiceImpl extends ServiceImpl<WarehouseStructur
     }
 
     /**
+     * 使用递归方法建树
+     *
+     * @param treeNodes
+     * @return
+     */
+    private List<WarehouseStructure> buildByRecursiveTwo(List<WarehouseStructure> treeNodes,Long id) {
+        List<WarehouseStructure> trees = new ArrayList<WarehouseStructure>();
+        if (!Objects.isNull(id) && id != 0) {
+            for (WarehouseStructure treeNode : treeNodes) {
+                if (treeNode.getId().equals(id)) {
+                    trees.add(findChildren(treeNode, treeNodes));
+                }
+            }
+        } else {
+            for (WarehouseStructure treeNode : treeNodes) {
+                if (null == treeNode.getParentId() || id.equals(treeNode.getParentId())) {
+                    trees.add(findChildren(treeNode, treeNodes));
+                }
+            }
+        }
+        return trees;
+    }
+
+    /**
      * 递归查找子节点
      * 
      * @param treeNodes

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -445,8 +445,7 @@ public class PointController extends AbstractBaseController {
 				map = pointMapper.getPointById(Long.valueOf(pointId));
 			}
 			ReginParams reginParams = getSelectedOrgInfo();
-			return CommonResponseUtil.success(equipFeign.gettreeWarehouse(reginParams.getPersonIdentity().getCompanyBizOrgCode(),map.get("buildingId").toString()));
-
+			return CommonResponseUtil.success(equipFeign.gettreeWarehouse(Long.valueOf(String.valueOf(map.get("buildingId"))), reginParams.getPersonIdentity().getCompanyBizOrgCode(),map.get("buildingId").toString()));
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return CommonResponseUtil.failure("查询巡检点失败");

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/EquipFeign.java

@@ -2,10 +2,7 @@ package com.yeejoin.amos.patrol.business.feign;
 
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -44,8 +41,8 @@ public interface EquipFeign {
     LinkedHashMap<String,Object> getRegionTress();
 
 
-    @RequestMapping(value = "${equip.fegin.prefix}"+"/warehouse-structure/gettree/0", method = RequestMethod.GET ,consumes="application/json")
-    LinkedHashMap<String,Object> gettreeWarehouse(@RequestParam(value = "bizOrgCode", required = true) String bizOrgCode,@RequestParam(value = "buildingId", required = false) String buildingId);
+    @RequestMapping(value = "${equip.fegin.prefix}"+"/warehouse-structure/gettree/{id}", method = RequestMethod.GET ,consumes="application/json")
+    LinkedHashMap<String,Object> gettreeWarehouse(@PathVariable Long id, @RequestParam(value = "bizOrgCode", required = true) String bizOrgCode, @RequestParam(value = "buildingId", required = false) String buildingId);
 
 
     @RequestMapping(value = "${equip.fegin.prefix}"+"/building/getOne", method = RequestMethod.GET ,consumes="application/json")

amos-boot-system-equip/src/main/resources/mapper/AnalysisReportLogMapper.xml

@@ -31,7 +31,7 @@
 			 </if>
 		</where>
 		ORDER BY
-		report_date_desc DESC
+		create_date DESC
     </select>
     
      <select id="getStation" resultType="Map">