Merge branch '登录权限部分调整' into uat

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/WxMagnetMapper.xml

@@ -189,9 +189,11 @@
             <if test="loginType != null and loginType != ''">
                 AND ur.shop_type = #{loginType}
             </if>
-            <if test="loginType = null and loginType = ''">
+
+            <if test="loginType = null or loginType == ''.toString()">
                 AND ur.shop_type is null
             </if>
+
         </where>
         order by  m.order_num
     </select>