修改应用编码校验

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteThemeMatterServiceImpl.java

@@ -163,6 +163,31 @@ public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThem
                 }
                 sum+=count;
             }
+
+
+            if (!ObjectUtils.isEmpty(allList)) {
+                //当前主题列表 查找站点事项id列表，保存站点主题事项
+                List<String> matterCodeList = allList.stream().map(m -> m.getMatterNo()).collect(Collectors.toList());
+                SiteMatterQuery siteMatterQuery = new SiteMatterQuery();
+                siteMatterQuery.setSiteId(siteEntity.getId());
+                siteMatterQuery.setMatterCodeList(matterCodeList);
+                List<SiteMatterEntity> siteMatterEntities = siteMatterService.find(siteMatterQuery, context);
+                log.info(String.format("size1:%d,size2:%d", allList.size(), siteMatterEntities.size()));
+                if (!ObjectUtils.isEmpty(siteMatterEntities)) {
+                    List<SiteThemeMatterEntity> collect = siteMatterEntities.stream().map(siteMatterEntity -> {
+                        SiteThemeMatterEntity siteThemeMatterEntity = new SiteThemeMatterEntity();
+                        siteThemeMatterEntity.initAttrValue();
+                        BeanUtils.copyProperties(siteMatterEntity, siteThemeMatterEntity, BeanUtil.getNullPropertyNames(siteMatterEntity));
+                        siteThemeMatterEntity.setThemeCode(item.getThemeCode());
+                        siteThemeMatterEntity.setThemeName(item.getThemeName());
+                        siteThemeMatterEntity.setUserType(item.getUserType());
+                        return siteThemeMatterEntity;
+                    }).collect(Collectors.toList());
+                    if (!ObjectUtils.isEmpty(collect)) {
+                        this.save(collect, context);
+                    }
+                }
+            }
         }
         return Rest.ok("乡镇主题更新完成","更新条数:"+sum);
     }