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

This commit is contained in:
yuqh 2024-11-18 18:18:48 +08:00
commit 79c44e1f2d
1 changed files with 14 additions and 10 deletions

View File

@ -346,12 +346,14 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
//根据formmain_id删除子表数据之后再新增这种情况只有data_id没有并且随时会变的时候才使用
//钉钉部门主数据编码和钉钉人员主数据编码
if(jsonObject.getString("mdmCode").equals("10015") || jsonObject.getString("mdmCode").equals("10016")) {
if(StrUtil.isNotEmpty(tableNameDetails)){
ComparisonDetailsEntity comparisonDetails = new ComparisonDetailsEntity();
comparisonDetails.setDbName(tableNameDetails);
comparisonDetails.setFormmainId(uuid);
comparisonDetails.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443");
comparisonDetailsDao.deleteComparisonDetailsByFormmainId(comparisonDetails);
}
}
//保存子表数据
@ -521,12 +523,14 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
//根据formmain_id删除子表数据之后再新增这种情况只有data_id没有并且随时会变的时候才使用
//钉钉人员主数据编码和钉钉部门主数据编码
if(jsonObject.getString("mdmCode").equals("10015") || jsonObject.getString("mdmCode").equals("10016")) {
if(StrUtil.isNotEmpty(tableNameDetails)){
ComparisonDetailsEntity comparisonDetails = new ComparisonDetailsEntity();
comparisonDetails.setDbName(tableNameDetails);
comparisonDetails.setFormmainId(id);
comparisonDetails.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443");
comparisonDetailsDao.deleteComparisonDetailsByFormmainId(comparisonDetails);
}
}
if (integer>0) {
//保存子表数据