Merge branch 'fixbug/1025505' into 'master'

bug: [1025505] 【UAT环境】【小程序端】【权益设置】添加群然后下架群还存在

See merge request rays/pcloud-book!958

pcloud-service-book/src/main/resources/mapper/rightssetting/RightNowItem.xml

@@ -242,7 +242,10 @@
         where
         serve_type = "GROUP"
         and
+        (
+        group_type is null or
         group_type <> 2
+        )
         and
         serve_id in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
@@ -257,7 +260,10 @@
         where
         serve_type = "GROUP"
         and
+        (
+        group_type is null or
         group_type &lt;&gt; 2
+        )
         and
         serve_id in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">

pcloud-service-book/src/main/resources/mapper/rightssetting/RightsSettingItemDetail.Mapper.xml

@@ -172,7 +172,10 @@
         where
         serve_type = "GROUP"
         and
+        (
+        group_type is null or
         group_type <> 2
+        )
         and
         serve_id in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
@@ -187,7 +190,10 @@
         where
         serve_type = "GROUP"
         and
+        (
+        group_type is null or
         group_type &lt;&gt; 2
+        )
         and
         serve_id in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">