Merge remote-tracking branch 'origin/房屋tree_yzm'

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPublicServiceOrgServiceImpl.java

@@ -89,11 +89,11 @@ public class IcPublicServiceOrgServiceImpl extends BaseServiceImpl<IcPublicServi
         checkUnqiueName(formDTO.getName(),formDTO.getAgencyId(),formDTO.getId());
         IcPublicServiceOrgEntity entity=ConvertUtils.sourceToTarget(formDTO,IcPublicServiceOrgEntity.class);
         baseDao.updateById(entity);
+        //先删除
+        LambdaQueryWrapper<IcPublicServiceOrgServiceMatterEntity> deleteWrapper=new LambdaQueryWrapper<>();
+        deleteWrapper.eq(IcPublicServiceOrgServiceMatterEntity::getOrgId,formDTO.getId());
+        icPublicServiceOrgServiceMatterDao.delete(deleteWrapper);
         if(CollectionUtils.isNotEmpty(formDTO.getServiceMatterList())){
-            //先删除
-            LambdaQueryWrapper<IcPublicServiceOrgServiceMatterEntity> deleteWrapper=new LambdaQueryWrapper<>();
-            deleteWrapper.eq(IcPublicServiceOrgServiceMatterEntity::getOrgId,formDTO.getId());
-            icPublicServiceOrgServiceMatterDao.delete(deleteWrapper);
             formDTO.getServiceMatterList().forEach(dto->{
                 IcPublicServiceOrgServiceMatterEntity serviceOrgServiceMatterEntity=ConvertUtils.sourceToTarget(dto,IcPublicServiceOrgServiceMatterEntity.class);
                 serviceOrgServiceMatterEntity.setOrgId(entity.getId());

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPublicServiceOrgDao.xml

@@ -62,7 +62,7 @@
           AND o.`NAME` LIKE concat( '%', #{name}, '%' )
         </if>
         <if test="null != categoryIds and categoryIds.size() > 0">
-            <foreach collection="categoryIds" item="categoryId" open="AND" separator="" close="">
+            <foreach collection="categoryIds" item="categoryId" open="AND (" separator="or" close=")">
                  m.CATEGORY_ID = #{categoryId}
             </foreach>
         </if>