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

3 years ago · 5d40b5a568
1 changed files with 1 additions and 1 deletions
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@ -716,7 +716,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
            }

            IcEventCategoryEntity icEventCategory = icEventCategoryService.getByEventId(formDTO.getIcEventId());
-            if (null == category) {
+            if (null == category || StringUtils.isEmpty(icEventCategory.getId())) {
                icEventCategoryService.insert(categoryEntity);
            } else {
                categoryEntity.setId(icEventCategory.getId());