修改同步小bug

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/BaseEnterpriseMqTtlListener.java

 package com.yeejoin.amos.boot.module.tzs.biz.listener;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,21 +63,27 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 		List<String> appCodes = aList.stream().filter(i -> "监管端,企业端".indexOf(i.getAppName()) != -1)
 				.map(i -> i.getAppCode()).collect(Collectors.toList());
 		FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(object.getLong("sequence_nbr"));
+		// FeignClientResult<Collection<CompanyModel>> cResult =
+		// Privilege.companyClient.queryAgencyTree(null);
+		String useCode = object.getString("use_code");
+		// if (useCode == null || !isUse(useCode, cResult.getResult())) {
 		if (cResult.getResult() == null) {
 			CompanyModel companyModel = new CompanyModel();
 			companyModel.setCompanyName(object.getString("use_unit"));
 			companyModel.setParentId(0L);
 			companyModel.setLevel("company");
-			companyModel.setSequenceNbr(object.getLong("sequence_nbr"));
-			companyModel.setCompanyCode(object.getString("use_code"));
-			FeignClientResult<HashMap<String,Object>>  result= Privilege.companyClient.queryByOrgcode(object.getString("supervise_org_code"));
-			//JSONObject parent = JSONObject.parseObject(JSONObject.toJSONString(result.getResult()));
-			if(result.getResult().get("sequenceNbr")!=null) 
-			{
+			// companyModel.setSequenceNbr(object.getLong("sequence_nbr"));
+			companyModel.setCompanyCode(useCode);
+			if (object.getString("supervise_org_code") != null) {
+				FeignClientResult<HashMap<String, Object>> result = Privilege.companyClient
+						.queryByOrgcode(object.getString("supervise_org_code"));
+				// JSONObject parent =
+				// JSONObject.parseObject(JSONObject.toJSONString(result.getResult()));
+				if (result.getResult().get("sequenceNbr") != null) {
 					companyModel.setParentId(Long.valueOf(result.getResult().get("sequenceNbr").toString()));
 				}
-			Privilege.companyClient.create(companyModel);
 			}
+			FeignClientResult<CompanyModel> createResult = Privilege.companyClient.create(companyModel);
 
 			String unitCode = object.getString("use_code");
 			if (unitCode == null || unitCode.length() < 6) {
@@ -97,10 +104,26 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 				Map<Long, List<Long>> orgRoles = new HashMap<>();
 				List<Long> roleIds = new ArrayList<>();
 				roleIds.add(list.getResult().get(0).getSequenceNbr());
-			orgRoles.put(object.getLong("sequence_nbr"), roleIds);
+				// orgRoles.put(object.getLong("sequence_nbr"), roleIds);
+				orgRoles.put(createResult.getResult().getSequenceNbr(), roleIds);
 				userModel.setAppCodes(appCodes);
 				userModel.setOrgRoleSeqs(orgRoles);
 				Privilege.agencyUserClient.create(userModel);
 			}
 		}
+
+	}
+
+	private boolean isUse(String useCode, Collection<CompanyModel> companys) {
+		for (Object obj : companys) {
+			String json = JSONObject.toJSONString(obj);
+			CompanyModel companyMode = JSONObject.toJavaObject(JSONObject.parseObject(json), CompanyModel.class);
+			if (useCode.equals(companyMode.getCompanyCode())) {
+				return true;
+			} else if (companyMode.getChildren() != null) {
+				return isUse(useCode, companyMode.getChildren());
+			}
+		}
+		return false;
+	}
 }