From fe81eb39c7402082f54e6aaee491efbcbb1aa50a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 May 2024 13:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml b/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml
index 8aeaf17..44eb280 100644
--- a/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml
+++ b/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml
@@ -79,7 +79,7 @@
</otherwise>
</choose>
</if>
- <if test="rotation.roleName=='inhabitant'">
+ <if test="rotation.roleName=='inhabitant' or rotation.roleName=='xyzt' or rotation.roleName=='xyty'">
and jr.type = 3
<if test="rotation.districtIdList == null ">
and jr.rotation_range is null
--
Gitblit v1.9.3