合并分支 'dev_20230216' 到 'master'

优化批量代替标准号接口查看合并请求 laws-foton-slrs/foton-slrs-system-rest!69
2023-04-26 20:45:45 +08:00
parent 5a8de6f34b b57892ca20
commit e9649385d0
1 changed files with 3 additions and 2 deletions
@@ -409,8 +409,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
            for (SarStandardsInfo sarStandardsInfoEO : sarStandardsInfoEOs) {
                if (sarStandardsInfoEO != null && ObjectUtils.isNotEmpty(sarStandardsInfoEO)) {
                    SarStandAttrInfo sarStandAttrInfo = sarStandAttrInfoEODao.getSarStandAttrInfo(sarStandardsInfoEO.getId());
-
-                    sarStandardsInfoEO.setReplacedStandNum(sarStandAttrInfo.getDtbjh());
+                    if (sarStandAttrInfo != null && ObjectUtils.isNotEmpty(sarStandAttrInfo)){
+                        sarStandardsInfoEO.setReplacedStandNum(sarStandAttrInfo.getDtbjh());
+                    }

                    if (StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){
                        dao.updateById(sarStandardsInfoEO);