Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzBaseEnterpriseInfoMapper.java

@@ -62,8 +62,8 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
 
     Map<String, Object> getProblemInfoBySourceId(@Param("sourceId")String sourceId);
 
-	@Update ("update tz_base_enterprise_info set SUPERVISE_ORG_NAME = #{superviseOrgName},SUPERVISE_ORG_CODE = REPLACE(SUPERVISE_ORG_CODE, #{oldSuperviseOrgCode}, #{preSuperviseOrgCode}), ORG_CODE = REPLACE(ORG_CODE, #{oldOrgCode}, #{preOrgCode}) where ORG_CODE LIKE concat(#{oldOrgCode}, '%')")
+	@Update ("update tz_base_enterprise_info set SUPERVISE_ORG_NAME = #{superviseOrgName},SUPERVISE_ORG_CODE = REPLACE(SUPERVISE_ORG_CODE, #{oldSuperviseOrgCode}, #{preSuperviseOrgCode}), ORG_CODE = REPLACE(ORG_CODE, #{oldOrgCode}, #{preOrgCode}) where sequence_nbr = #{sequenceNbr}")
 	void updateSubCompanyOrgCode(@Param("superviseOrgName") String superviseOrgName, @Param("oldSuperviseOrgCode") String oldSuperviseOrgCode, @Param("preSuperviseOrgCode")  String preSuperviseOrgCode,
-								 @Param("oldOrgCode") String oldOrgCode, @Param("preOrgCode")  String preOrgCode);
+								 @Param("oldOrgCode") String oldOrgCode, @Param("preOrgCode")  String preOrgCode, @Param("sequenceNbr") Long sequenceNbr);
 
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -1385,10 +1385,6 @@ public class TzBaseEnterpriseInfoServiceImpl
 	public void refreshCompanyInfo(JSONObject dataResult) {
 		try {
 			CompanyBo companyBo = JSON.parseObject(dataResult.toJSONString(), CompanyBo.class);
-			String preSuperviseOrgCode = companyBo.getOrgCode().replace("*" + companyBo.getCompanyOrgCode(), "");
-			HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(preSuperviseOrgCode).getResult();
-			// 目前平台返回key为compnay(存在拼写错误)
-			CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
 			// 调用平台获取子单位
 			FeignClientResult<List<CompanyModel>> result = Privilege.companyClient.queryListByOrgCode(companyBo.getOrgCode());
 			if (result == null || result.getResult() == null) {
@@ -1400,16 +1396,21 @@ public class TzBaseEnterpriseInfoServiceImpl
 			if (!ValidationUtil.isEmpty(companyBo.getCompanyCode())) {
 				useCodes.add(companyBo.getCompanyCode());
 			}
+			Map<String, List<CompanyModel>> companyModelMap = companyModels.stream().collect(Collectors.groupingBy(CompanyModel::getCompanyCode));
 			List<TzBaseEnterpriseInfo> tzBaseEnterpriseInfos = tzBaseEnterpriseInfoMapper.selectList(new QueryWrapper<TzBaseEnterpriseInfo>().in("use_code", useCodes));
 			// privilege_company 有触发器更新，只需要更新 tz_base_enterprise_info
 			if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfos)) {
 				for (TzBaseEnterpriseInfo tzBaseEnterpriseInfo : tzBaseEnterpriseInfos) {
-					String oldOrgCode = tzBaseEnterpriseInfo.getOrgCode(); // 旧的org_code
-					String preOrgCode = companyBo.getOrgCode();// 新的org_code
+					String oldOrgCode = tzBaseEnterpriseInfo.getOrgCode();// 旧的org_code
+					CompanyModel companyModel = companyModelMap.get(tzBaseEnterpriseInfo.getUseCode()).get(0);
+					String preOrgCode = companyModel.getOrgCode();// 新的org_code
 					String oldSuperviseOrgCode = tzBaseEnterpriseInfo.getSuperviseOrgCode();
-
+					String preSuperviseOrgCode = companyModel.getOrgCode().replace("*" + companyModel.getCompanyOrgCode(), "");
+					HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(preSuperviseOrgCode).getResult();
+					// 目前平台返回key为compnay(存在拼写错误)
+					CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
 					// 更新 tz_base_enterprise_info
-					 tzBaseEnterpriseInfoMapper.updateSubCompanyOrgCode(parentModel.getCompanyName(), oldSuperviseOrgCode, preSuperviseOrgCode, oldOrgCode, preOrgCode);
+					tzBaseEnterpriseInfoMapper.updateSubCompanyOrgCode(parentModel.getCompanyName(), oldSuperviseOrgCode, preSuperviseOrgCode, oldOrgCode, preOrgCode, tzBaseEnterpriseInfo.getSequenceNbr());
 				}
 			}
 		} catch (Exception e) {