小程序修改

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SettledMerchantsServiceImpl.java

@@ -148,7 +148,7 @@ public class SettledMerchantsServiceImpl implements ISettledMerchantsService
             user.setUserName(settledMerchants.getBusinessPhone());
             user.setNickName(settledMerchants.getBusinessName());
             user.setPhonenumber(settledMerchants.getBusinessPhone());
-            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+            user.setPassword(SecurityUtils.encryptPassword(settledMerchants.getBusinessPhone()));
             userService.insertUser(user);
 
         }

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

@@ -40,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectUsageRecordVo"/>
         <where>
             <if test="creditId != null  and creditId != ''"> and credit_id = #{creditId}</if>
+            <if test="creditPhone != null  and creditPhone != ''"> and credit_phone = #{creditPhone}</if>
+            <if test="businessId != null  and businessId != ''"> and business_id = #{businessId}</if>
             <if test="creditName != null  and creditName != ''"> and credit_name like concat( #{creditName}, '%')</if>
             <if test="recordYear != null  and recordYear != ''"> and record_year = #{recordYear }</if>
             <if test="recordLevel != null  and recordLevel != ''"> and record_level = #{recordLevel}</if>