hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 

 Conflicts:
	buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
	service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
This commit is contained in:
lvleigang 2024-06-21 17:02:07 +08:00
parent 14d1532be3 53000de5ae
commit e694304837
5 changed files with 92 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
View File

@ -307,7 +307,6 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) { for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) {
if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){ if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){
for (int i3 = 0; i3 < detail.size(); i3++) { for (int i3 = 0; i3 < detail.size(); i3++) {
if(detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){
if(detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){ if(detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){
Map<String,Object> mapDetail = new HashMap<>(); Map<String,Object> mapDetail = new HashMap<>();
mapDetail.put("tableName",mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue()); mapDetail.put("tableName",mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue());
@ -315,7 +314,6 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
JSONObject objectDetail = mdmModuleDao.queryMdmST(mapDetail); JSONObject objectDetail = mdmModuleDao.queryMdmST(mapDetail);
detail.get(i3).put(mdmModuleDbFiledsEntities.get(i2).getEnName(),objectDetail); detail.get(i3).put(mdmModuleDbFiledsEntities.get(i2).getEnName(),objectDetail);
} }
}
} }
} }
@ -1027,7 +1025,6 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) { for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) {
if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){ if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){
for (int i3 = 0; i3 < detail.size(); i3++) { for (int i3 = 0; i3 < detail.size(); i3++) {
if(detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){
if(detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){ if(detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName()) != null){
Map<String,Object> mapDetail = new HashMap<>(); Map<String,Object> mapDetail = new HashMap<>();
mapDetail.put("tableName",mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue()); mapDetail.put("tableName",mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue());
@ -1043,7 +1040,6 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
} }
} }
} }
}
object.put(mdmModuleDbEntities.get(i).getDbName(),detail); object.put(mdmModuleDbEntities.get(i).getDbName(),detail);
} }
} }