联动单位 新增经纬度 值班模板导出去除过滤

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

@@ -132,13 +132,11 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 		if (linkageUnitDto.getAddress() != null) {
 			JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(linkageUnitDto.getAddress());
 			linkageUnitDto.setAddress(address.getString(BizConstant.ADDRESS));
-			String[] addressArr = linkageUnitDto.getAddress().split("@address@");
-			JSONObject jsonObject = JSONObject.parseObject(addressArr[1]);
-			if (StringUtils.isNotEmpty(jsonObject.getString(BizConstant.LONGITUDE))) {
-				linkageUnitDto.setLongitude(Double.valueOf(jsonObject.getString(BizConstant.LONGITUDE)));
+			if (StringUtils.isNotEmpty(address.getString(BizConstant.LONGITUDE))) {
+				linkageUnitDto.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
 			}
-			if (StringUtils.isNotEmpty(jsonObject.getString(BizConstant.LATITUDE))) {
-				linkageUnitDto.setLatitude(Double.valueOf(jsonObject.getString(BizConstant.LATITUDE)));
+			if (StringUtils.isNotEmpty(address.getString(BizConstant.LATITUDE))) {
+				linkageUnitDto.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
 			}
 		}
 		// 1.保存行数据

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

@@ -1710,7 +1710,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		// BUG 2843 过滤没有绑定关联账户的user by kongfm 2021-09-16
 		List<OrgUsr> tempUserList = this
 				.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete, false).eq(OrgUsr::getParentId, parentId)
-						.eq(OrgUsr::getBizOrgType, bizOrgType).isNotNull(OrgUsr::getAmosOrgId));
+						.eq(OrgUsr::getBizOrgType, bizOrgType));
 		tempUserList.stream().forEach(m -> {
 			if (StringUtils.isNotEmpty(m.getAmosOrgId())) {
 				FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(m.getAmosOrgId());