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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -263,7 +263,7 @@ public class JgUseRegistration extends BaseEntity {
     private String supervisionOrgCode;
 
     /**
-     * 工程装置id
+     * 工程装置id ( 主键sequence_nbr )
      */
     @TableField("project_contraption_id")
     private String projectContraptionId;

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

@@ -1405,7 +1405,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 					String oldSuperviseOrgCode = tzBaseEnterpriseInfo.getSuperviseOrgCode();
 					String newSuperviseOrgCode = companyModel.getOrgCode().replace("*" + companyModel.getCompanyOrgCode(), "");
 					// 更新 tz_base_enterprise_info。只有管辖机构有改动才更新
-					if (!newSuperviseOrgCode.equals(oldSuperviseOrgCode)) {
+					if (!newOrgCode.equals(oldOrgCode)) {
 						HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(newSuperviseOrgCode).getResult();
 						// 目前平台返回key为compnay(存在拼写错误)
 						CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
@@ -1425,5 +1425,6 @@ public class TzBaseEnterpriseInfoServiceImpl
 	public void updateUnitOrgCode(TzBaseEnterpriseInfo tzBaseEnterpriseInfo, CompanyModel parentModel, String oldSuperviseOrgCode, String newSuperviseOrgCode, String oldOrgCode, String newOrgCode) {
 		tzBaseEnterpriseInfoMapper.updateSubCompanyOrgCode(parentModel.getCompanyName(), oldSuperviseOrgCode, newSuperviseOrgCode, oldOrgCode, newOrgCode, tzBaseEnterpriseInfo.getSequenceNbr());
 		tzBaseEnterpriseInfoMapper.updateUnitOrgCode(oldOrgCode, newOrgCode);
+		publisher.publish(new DataRefreshEvent(this,  Collections.singletonList(tzBaseEnterpriseInfo.getSequenceNbr() + ""), DataRefreshEvent.DataType.enterprise.name(), DataRefreshEvent.Operation.UPDATE));
 	}
 }