diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java index c32080d1..8ec63458 100644 --- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java +++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java @@ -1411,6 +1411,26 @@ public class MdmModuleServiceImpl extends BaseService i } } } + //查询sysPk,sysCode,sysName段是否存在 add by zyd 2025-06-09 +// boolean isSysPk = false; +// boolean isSysCode = false; +// boolean isSysName = false; + for (MdmModuleDbFiledsEntity dbFiledsEntity : mdmModuleDbFiledsEntityList) { + if ("Y".equals(dbFiledsEntity.getSysPk())) { +// isSysPk = true; + return BaseResult.getFailureMessageEntity("系统主键字段已存在,请修改"); + } + if ("Y".equals(dbFiledsEntity.getSysCode())) { +// isSysCode = true; + return BaseResult.getFailureMessageEntity("系统code字段已存在,请修改"); + } + if ("Y".equals(dbFiledsEntity.getSysName())) { +// isSysName = true; + return BaseResult.getFailureMessageEntity("系统name字段已存在,请修改"); + } + } + + entity.setCreate(); if ("1".equals(entity.getDbType())) { entity.setAddType("1"); diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java index 3e1debd5..79092656 100644 --- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java +++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java @@ -216,5 +216,42 @@ public class MdmModuleDbFiledsEntity extends BaseEntity { public void setDbType(String dbType) { this.dbType = dbType; } + + /** + * 是否sys主键 系统主键(三方系统主键,同步中台之后,该字段作为主键)Y/N + */ + private String sysPk; + /** + * 是否sys编码 系统code(三方系统code,同步中台之后,该字段作为code)Y/N + */ + private String sysCode; + /** + * 是否sys名称 系统name(三方系统name,同步中台之后,该字段作为name)Y/N + */ + private String sysName; + + public String getSysPk() { + return sysPk; + } + + public void setSysPk(String sysPk) { + this.sysPk = sysPk; + } + + public String getSysCode() { + return sysCode; + } + + public void setSysCode(String sysCode) { + this.sysCode = sysCode; + } + + public String getSysName() { + return sysName; + } + + public void setSysName(String sysName) { + this.sysName = sysName; + } } diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml index 0bb6e1c3..7225c4b7 100644 --- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml @@ -24,6 +24,9 @@ + + + @@ -48,6 +51,9 @@ ,sts ,org_id ,company_id + ,sys_pk + ,sys_code + ,sys_name