修改扫描问题

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

@@ -2677,7 +2677,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		List<FormValue> dynamicFormAlert = orgPersonFormVo.getDynamicFormAlert();
 		Map<String, String> collect = dynamicFormAlert.stream().collect(HashMap::new,
 				(map, item) -> map.put(item.getKey(), item.getValue()), HashMap::putAll);
-		JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(orgPersonFormVo));
+		JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(orgPersonFormVo));
 		jsonObject.put("map", collect);
 		return jsonObject;
 	}
@@ -2821,51 +2821,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		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);
-
-		}
+		 baseMapper.selectOne(wrapper);
 
+		List<OrgUsr> list = null;
 		list = orgUsrMapper.companyTreeByUser(reginParams.getPersonIdentity().getBizOrgCode());
 		return buildTreeParallel(list);
 	}
-//    /**
-//     * 同步单位信息到防火监督point表
-//     *
-//     * @param companyIdList
-//     */
-//    protected void syncCompany2Supervision(List<Long> companyIdList) {
-//        if (ValidationUtil.isEmpty(companyIdList)) {
-//            return;
-//        }
-//        String token = RequestContext.getToken();
-//        String appKey = RequestContext.getAppKey();
-//        String product = RequestContext.getProduct();
-//        new Thread(() -> companyIdList.forEach(id -> {
-//            try {
-//                RequestContext.setAppKey(appKey);
-//                RequestContext.setToken(token);
-//                RequestContext.setProduct(product);
-//                OrgUsrFormDto formDto = this.selectCompanyById(id);
-//                if (!ValidationUtil.isEmpty(formDto) && OrgPersonEnum.公司.getKey().equals(formDto.getBizOrgType())) {
-//                    emqKeeper.getMqttClient().publish(airportAddTopic, JSON.toJSONString(formDto).getBytes(), 2, false);
-//                }
-//            } catch (Exception e) {
-//                logger.debug("syncCompany2Supervision error:", e.getMessage());
-//                e.printStackTrace();
-//            }
-//        })).start();
-//    }
+
 
 	public String getIdNumberByAmosId(String amosId) {
 		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
@@ -2899,8 +2861,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 
 	public List<OrgUsr>	getByAmosId(List<String> amosIds) {
+		List<OrgUsr> da=null;
 		if (ValidationUtil.isEmpty(amosIds)) {
-			return null;
+			return da;
 		}
 		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(OrgUsr::getAmosOrgId, amosIds);
@@ -2909,8 +2872,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	public List<OrgUsr>	getByOrgCode(String bizOrgCode) {
+		List<OrgUsr> da=null;
 		if (StringUtils.isEmpty(bizOrgCode)) {
-			return null;
+			return da;
 		}
 		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
 		wrapper.likeRight(OrgUsr::getBizOrgCode,bizOrgCode);
@@ -2922,8 +2886,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	private List<OrgUsr> getIdByOrgCode(String bizOrgCode, Long id) {
+		List<OrgUsr> da=null;
 		if (StringUtils.isEmpty(bizOrgCode)) {
-			return null;
+			return da;
 		}
 		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
 		wrapper.likeRight(OrgUsr::getBizOrgCode,bizOrgCode);
@@ -3021,11 +2986,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 		FirefightersPost firefightersPost = peopleInfoDto.getPostEduDtoObj().getFirefightersPost();
 		PeopleBasicInfoDto firefighters = peopleInfoDto.getFirefighters();
-		String s2 = JSONObject.toJSONString(firefighters);
-		Map map2 = JSONObject.parseObject(s2, Map.class);
+		String s2 = JSON.toJSONString(firefighters);
+		Map map2 = JSON.parseObject(s2, Map.class);
 
-		String s = JSONObject.toJSONString(firefightersPost);
-		Map map1 = JSONObject.parseObject(s, Map.class);
+		String s = JSON.toJSONString(firefightersPost);
+		Map map1 = JSON.parseObject(s, Map.class);
 		map1.putAll(map2);
 
 		dynamicFormValue.forEach(dynamicFormInstanceDto -> {
@@ -3100,10 +3065,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	public void saveFirefighters(PeopleInfoDto peopleInfoDto){
 		/*3184 消防人员，编辑页面岗位选择子分类保存成功后，概要中岗位未修改 chenzhao start 2021-10-19*/
-//		if (peopleInfoDto.getFirefighters().getJobTitleCode() != null && !firefighters.getFirefighters().getJobTitleCode().equals("")) {
-//			DataDictionary gwmc = dataDictionaryService.getByCode(firefighters.getFirefighters().getJobTitleCode(), "GWMC");
-//			firefighters.getFirefighters().setJobTitle(gwmc.getName());
-//		}
+
 		PeopleBasicInfoDto firefighters = peopleInfoDto.getFirefighters();
 		Firefighters firefightersNew = new Firefighters();
 		BeanUtils.copyProperties(firefighters, firefightersNew);
@@ -3133,7 +3095,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	public void saveFirefightersPost(FirefightersDataDto firefightersDataDto, Long id){
 		QueryWrapper queryWrapper = new QueryWrapper<>();
-		//queryWrapper.eq("org_usr_id", firefightersDataDto.getFirefightersPost().getOrgUsrId());
 		queryWrapper.eq("org_usr_id", id);
 		FirefightersPost firefightersPost = iFirefightersPostService.getOne(queryWrapper);
 
@@ -3197,12 +3158,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 					if (!ObjectUtils.isEmpty(value)) {
 						Date date;
 						SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-						try {
+
 							date = ft.parse(value.toString());
 							field.set(peopleBasicInfoDto, date);
-						} catch (Exception e) {
-							logger.error("日期转换失败");
-						}
+
 					}
 				} else {
 					field.set(peopleBasicInfoDto, value);
@@ -3323,6 +3282,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			deleteFirefighters(id);
 		}
 		//  巡检站端与中心级数据同步
+
+
 		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
 			@Override
 			public void afterCommit() {
@@ -3330,6 +3291,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				dataSyncService.OrgUsrSyncDtoDelDataSync(id);
 			}
 		});
+
 		return "0";
 	}