jczz_manager.git

parent: 9f6332a7 | patch | commit | show whitespace

zhongrj

2024-03-19 aceacde71011b310b972af4df2d7b70b61769ad6

过滤查询问题修复

7 files modified

	src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml	4 ●●●●● patch \| view \| raw \| blame \| history

 src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml

@@ -104,7 +104,7 @@
                        <otherwise>
                            and
                            (
                            jg.grid_code in ('') or jpag.community_code in in ('')
                            jg.grid_code in ('') or jpag.community_code in ('')
                            )
                        </otherwise>
                    </choose>

 src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml

@@ -375,7 +375,7 @@
                        <otherwise>
                            and
                            (
                            jg.grid_code in ('') or jpag.community_code in in ('')
                            jg.grid_code in ('') or jpag.community_code in ('')
                            )
                        </otherwise>
                    </choose>

 src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml

@@ -71,7 +71,7 @@
                        <otherwise>
                            and
                            (
                            jg.grid_code in ('') or jpag.community_code in in ('')
                            jg.grid_code in ('') or jpag.community_code in ('')
                            )
                        </otherwise>
                    </choose>
@@ -169,7 +169,7 @@
                            <otherwise>
                                and
                                (
                                jg.grid_code in ('') or jpag.community_code in in ('')
                                jg.grid_code in ('') or jpag.community_code in ('')
                                )
                            </otherwise>
                        </choose>

 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml

@@ -266,7 +266,7 @@
                        <otherwise>
                            and
                            (
                            jg.grid_code in ('') or jpag.community_code in in ('')
                            jg.grid_code in ('') or jpag.community_code in ('')
                            )
                        </otherwise>
                    </choose>
@@ -644,7 +644,7 @@
                        <otherwise>
                            and
                            (
                            jg.grid_code in ('') or jpag.community_code in in ('')
                            jg.grid_code in ('') or jpag.community_code in ('')
                            )
                        </otherwise>
                    </choose>

 src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java

@@ -45,7 +45,7 @@
                                                            @Param("vo") PoliceAlarmRecordsVO policeAlarmRecords,
                                                            @Param("isAdministrator") Integer isAdministrator,
                                                            @Param("regionChildCodesList") List<String> regionChildCodesList,
                                                            @Param("vo") List<String> gridCodeList);
                                                            @Param("gridCodeList") List<String> gridCodeList);


}

 src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml

@@ -71,14 +71,14 @@
                            <otherwise>
                                and
                                (
                                jg.grid_code in ('') or jpag.community_code in in ('')
                                jg.grid_code in ('') or jpag.community_code in ('')
                                )
                            </otherwise>
                        </choose>
                    </otherwise>
                </choose>
            </if>
           and  is_deleted = 0
           and jpar.is_deleted = 0
        </where>
    </select>


 src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml

@@ -331,7 +331,7 @@
                            <otherwise>
                                and
                                (
                                jg.grid_code in ('') or jpag.community_code in in ('')
                                jg.grid_code in ('') or jpag.community_code in ('')
                                )
                            </otherwise>
                        </choose>
@@ -601,7 +601,7 @@
                            <otherwise>
                                and
                                (
                                jg.grid_code in ('') or jpag.community_code in in ('')
                                jg.grid_code in ('') or jpag.community_code in ('')
                                )
                            </otherwise>
                        </choose>

			@@ -104,7 +104,7 @@
			<otherwise>
			and
			(
			jg.grid_code in ('') or jpag.community_code in in ('')
			jg.grid_code in ('') or jpag.community_code in ('')
			)
			</otherwise>
			</choose>

			@@ -375,7 +375,7 @@
			<otherwise>
			and
			(
			jg.grid_code in ('') or jpag.community_code in in ('')
			jg.grid_code in ('') or jpag.community_code in ('')
			)
			</otherwise>
			</choose>

			@@ -71,7 +71,7 @@
			<otherwise>
			and
			(
			jg.grid_code in ('') or jpag.community_code in in ('')
			jg.grid_code in ('') or jpag.community_code in ('')
			)
			</otherwise>
			</choose>
			@@ -169,7 +169,7 @@
			<otherwise>
			and
			(
			jg.grid_code in ('') or jpag.community_code in in ('')
			jg.grid_code in ('') or jpag.community_code in ('')
			)
			</otherwise>
			</choose>

			@@ -266,7 +266,7 @@
			<otherwise>
			and
			(
			jg.grid_code in ('') or jpag.community_code in in ('')
			jg.grid_code in ('') or jpag.community_code in ('')
			)
			</otherwise>
			</choose>
			@@ -644,7 +644,7 @@
			<otherwise>
			and
			(
			jg.grid_code in ('') or jpag.community_code in in ('')
			jg.grid_code in ('') or jpag.community_code in ('')
			)
			</otherwise>
			</choose>

			@@ -45,7 +45,7 @@
			@Param("vo") PoliceAlarmRecordsVO policeAlarmRecords,
			@Param("isAdministrator") Integer isAdministrator,
			@Param("regionChildCodesList") List<String> regionChildCodesList,
			@Param("vo") List<String> gridCodeList);
			@Param("gridCodeList") List<String> gridCodeList);


			}

			@@ -71,14 +71,14 @@
			<otherwise>
			and
			(
			jg.grid_code in ('') or jpag.community_code in in ('')
			jg.grid_code in ('') or jpag.community_code in ('')
			)
			</otherwise>
			</choose>
			</otherwise>
			</choose>
			</if>
			and is_deleted = 0
			and jpar.is_deleted = 0
			</where>
			</select>

			@@ -331,7 +331,7 @@
			<otherwise>
			and
			(
			jg.grid_code in ('') or jpag.community_code in in ('')
			jg.grid_code in ('') or jpag.community_code in ('')
			)
			</otherwise>
			</choose>
			@@ -601,7 +601,7 @@
			<otherwise>
			and
			(
			jg.grid_code in ('') or jpag.community_code in in ('')
			jg.grid_code in ('') or jpag.community_code in ('')
			)
			</otherwise>
			</choose>