修改显示条件

ruoyi-admin/src/main/java/com/ruoyi/web/controller/h5/H5Controller.java

@@ -49,7 +49,7 @@ public class H5Controller extends BaseController
 
 
     /**
-     * 查询入驻商家列表全部
+     * 查询政策类别列表
      */
     @GetMapping("/policy/list")
     public AjaxResult policyList(PolicyMenu policyMenu)

ruoyi-system/src/main/resources/mapper/system/CreditUserMapper.xml

@@ -40,7 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCreditUserList" parameterType="CreditUser" resultMap="CreditUserResult">
         <include refid="selectCreditUserVo"/>
-        <where>  
+        <where>
+            is_del = 'N'
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
             <if test="creditLevel != null  and creditLevel != ''"> and credit_level = #{creditLevel}</if>
             <if test="gender != null  and gender != ''"> and gender = #{gender}</if>
@@ -52,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectCreditUserById" parameterType="Long" resultMap="CreditUserResult">
         <include refid="selectCreditUserVo"/>
-        where id = #{id}
+        where id = #{id} and is_del = 'N'
     </select>
 
     <select id="selectCreditUser" parameterType="CreditUser" resultMap="CreditUserResult">

ruoyi-system/src/main/resources/mapper/system/PolicyGuideMapper.xml

@@ -22,7 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPolicyGuideList" parameterType="PolicyGuide" resultMap="PolicyGuideResult">
         <include refid="selectPolicyGuideVo"/>
-        <where>  
+        <where>
+            status = '0'
             <if test="policyTitle != null  and policyTitle != ''"> and policy_title = #{policyTitle}</if>
         </where>
         order by create_time DESC
@@ -30,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectPolicyGuideByPolicyId" parameterType="Long" resultMap="PolicyGuideResult">
         <include refid="selectPolicyGuideVo"/>
-        where policy_id = #{policyId}
+        where policy_id = #{policyId} and status = '0'
     </select>
         
     <insert id="insertPolicyGuide" parameterType="PolicyGuide" useGeneratedKeys="true" keyProperty="policyId">

ruoyi-system/src/main/resources/mapper/system/SettledMerchantsMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSettledMerchantsList" parameterType="SettledMerchants" resultMap="SettledMerchantsResult">
         <include refid="selectSettledMerchantsVo"/>
-        <where>  
+        <where>
             <if test="businessName != null  and businessName != ''"> and business_name like concat('%', #{businessName}, '%')</if>
             <if test="businessPhone != null  and businessPhone != ''"> and business_phone = #{businessPhone}</if>
         </where>
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSettledMerchantsByMenuId" parameterType="Long" resultMap="SettledMerchantsResult">
         <include refid="selectSettledMerchantsVo"/>
-        where policy_id = #{menuId}
+        where policy_id = #{menuId} and status = '0' and visible = '0' order by order_num
     </select>
         
     <insert id="insertSettledMerchants" parameterType="SettledMerchants" useGeneratedKeys="true" keyProperty="businessId">