bug修改

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -611,6 +611,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     //修改通知部门Id（街道Id）
                     ItemInformationEntity itemInfoStreetDto = new ItemInformationEntity();
                     BeanUtils.copyProperties(itemInfoDto,itemInfoStreetDto);
+                    itemInfoStreetDto.setId(null);
                     Result<CompleteDeptDTO>  result =adminFeignClient.getCompleteDept(entity.getGridId());
                     CompleteDeptDTO comDeptDto = result.getData();
                     itemInfoStreetDto.setDeptId(comDeptDto.getStreetId().toString());
@@ -635,6 +636,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     // 通知部门Id（被吹哨部门）
                     ItemInformationEntity itemInfoEachDto = new ItemInformationEntity();
                     BeanUtils.copyProperties(itemInfoDto,itemInfoEachDto);
+                    itemInfoEachDto.setId(null);
                     itemInfoEachDto.setDeptId(itemDto.getDeptId().toString());
                     itemInformationService.insert(itemInfoEachDto);
                 }
@@ -647,6 +649,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     // 通知部门Id（被吹哨部门）
                     ItemInformationEntity itemInfoEachDto = new ItemInformationEntity();
                     BeanUtils.copyProperties(itemInfoDto,itemInfoEachDto);
+                    itemInfoEachDto.setId(null);
                     itemInfoEachDto.setDeptId(itemDeptId.toString());
                     itemInformationService.insert(itemInfoEachDto);
                 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -402,26 +402,24 @@
                     #{deptId}
                 </foreach>
             </if>
+        <if test="gridId != null and gridId != ''">
+            AND dept.DEPT_ID = #{gridId}
+        </if>
+        <if test="streetId != null and streetId != ''">
+            AND dept.DEPT_ID = #{streetId}
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND dept.DEPT_ID = #{communityId}
+        </if>
+
                  ) temp
             )
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </if>
-            <if test="gridId != null and gridId != ''">
+        <if test="itemCode != null and itemCode != ''">
-                AND (item.GRID_ID = #{gridId}
+            AND item.ITEM_CODE like concat('%', #{itemCode}, '%')
-                OR find_in_set(#{gridId},item.ALL_DEPT_IDS))
+        </if>
-            </if>
-            <if test="streetId != null and streetId != ''">
-                AND (find_in_set(#{streetId},item.PARENT_DEPT_IDS)
-                OR find_in_set(#{streetId},item.ALL_DEPT_IDS))
-            </if>
-            <if test="communityId != null and communityId != ''">
-                AND (find_in_set(#{communityId},item.PARENT_DEPT_IDS)
-                OR find_in_set(#{communityId},item.ALL_DEPT_IDS))
-            </if>
-            <if test="itemCode != null and itemCode != ''">
-                AND item.ITEM_CODE like concat('%', #{itemCode}, '%')
-            </if>
         ORDER BY
             item.CREATED_TIME DESC
     </select>