FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!78
This commit is contained in:
高嵩
2023-05-15 18:07:13 +08:00
parent 81991ef0c3 d7754c7ca7
commit 0c81d39e74
5 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+15 -15
View File
@@ -3194,21 +3194,21 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
int size = sarStandMenuEODao.insert(sarStandMenuEO);
}
}
// if (getInfo == null || getInfo.isEmpty()) {
// sarStandMenuEO.setId(UUIDUtils.randomUUID20());
// int size = sarStandMenuEODao.insert(sarStandMenuEO);
//// if (size>0){
//// return true;
//// }
// } else {
// sarStandMenuEO.setOldMenuId(secondLevelId);
// List<String> menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId);
// sarStandMenuEO.setMenuIds(menuOldIds);
// int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
//// if (size>0) {
//// return true;
//// }
// }
if (getInfo == null || getInfo.isEmpty()) {
sarStandMenuEO.setId(UUIDUtils.randomUUID20());
int size = sarStandMenuEODao.insert(sarStandMenuEO);
if (size>0){
return true;
}
} else {
sarStandMenuEO.setOldMenuId(secondLevelId);
List<String> menuOldIdsInfo = sarMenuEOService.getChildMenuList(secondLevelId);
sarStandMenuEO.setMenuIds(menuOldIdsInfo);
int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
if (size>0) {
return true;
}
}
}
return true;
}