Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java

@@ -118,7 +118,18 @@ public class AlertCalled extends BaseEntity {
     @TableField(exist=false)
     private String callTimeEnd ;
     /*bug 2408 接警记录，按警情状态和接警时间筛选功能失效 陈召 2021-09-22 结束*/
-  
+
+
+
+    @ApiModelProperty(value = "经度")
+    @TableField(exist=false)
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    @TableField(exist=false)
+    private String latitude;
+
+
     @TableField(exist=false)
     @ApiModelProperty(value = "是否处警")
     private Boolean isFatherAlert = false;

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -166,6 +166,8 @@ public class CommandController extends BaseController {
         return ResponseHelper.buildResponse(list);
     }
 
+
+
     /**
      * 分页警情列表
      *
@@ -1445,6 +1447,8 @@ public class CommandController extends BaseController {
         //获取正在进行的灾情null
         if (userCar != null) {
             AlertCalled alertCalled = powerTransferCompanyResourcesService.getByPowerTransferCompanyResourId(userCar.getCarId());
+            alertCalled.setLatitude(alertCalled.getCoordinateX()!=null?alertCalled.getCoordinateX().toString():null);
+            alertCalled.setLongitude(alertCalled.getCoordinateY()!=null?alertCalled.getCoordinateY().toString():null);
             return ResponseHelper.buildResponse(alertCalled);
         }
         return ResponseHelper.buildResponse(null);

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

@@ -1431,6 +1431,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return list;
 	}
 
+	public List<OrgUsr> equipCompanyExport(ReginParams reginParams, String type) {
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.likeRight(OrgUsr::getBizOrgCode,reginParams.getPersonIdentity().getBizOrgCode());
+		wrapper.eq(OrgUsr::getBizOrgType,"DEPARTMENT").or().eq(OrgUsr::getBizOrgType,"COMPANY");
+		wrapper.eq(BaseEntity::getIsDelete,false);
+		List<OrgUsr> list = baseMapper.selectList(wrapper);
+		return list;
+	}
+
 	@Override
 	public List<CheckObjectDto> companyListByUser(AgencyUserModel user) {
 		List<CheckObjectDto> list = new ArrayList<>();
@@ -2307,7 +2316,26 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		Map<String, Object> param = new HashMap<>();
 		// 权限处理
 		PermissionInterceptorContext.setDataAuthRule(authKey);
-		List<OrgUsr> list = orgUsrMapper.companyTreeByUser(reginParams.getPersonIdentity().getBizOrgCode());
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(OrgUsr::getBizOrgCode,reginParams.getPersonIdentity().getBizOrgCode());
+		wrapper.eq(BaseEntity::getIsDelete,false);
+		wrapper.isNull(OrgUsr::getParentId);
+		OrgUsr orgUsr = baseMapper.selectOne(wrapper);
+
+		List<OrgUsr> list = new ArrayList<>();
+
+		if (ValidationUtil.isEmpty(orgUsr)){
+			 list = orgUsrMapper.companyTreeByUser(reginParams.getPersonIdentity().getBizOrgCode());
+		}else {
+			LambdaQueryWrapper<OrgUsr> queryWrapper= new LambdaQueryWrapper<>();
+			wrapper.likeRight(OrgUsr::getBizOrgCode,reginParams.getPersonIdentity().getBizOrgCode());
+			wrapper.eq(BaseEntity::getIsDelete,false);
+			wrapper.eq(OrgUsr::getBizOrgType,"DEPARTMENT");
+			baseMapper.selectList(queryWrapper);
+
+		}
+
+		 list = orgUsrMapper.companyTreeByUser(reginParams.getPersonIdentity().getBizOrgCode());
 		return buildTreeParallel(list);
 	}
 //    /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java

@@ -578,7 +578,7 @@ public class DataSourcesImpl implements DataSources {
         ReginParams reginParams = result.getResult();
 
 
-        List<OrgUsr> menus = iOrgUsrService.companyTreeByUserAndTypeNoTree(reginParams, null);
+        List<OrgUsr> menus = iOrgUsrService.equipCompanyExport(reginParams, null);
         List<String> names = menus.stream().map(item -> {
             return item.getBizOrgName() + "@" + item.getSequenceNbr() + "@" + item.getBizOrgCode();
         }).collect(Collectors.toList());