wuhp 2 жил өмнө
parent
commit
98363b62b4

+ 3 - 0
src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -889,6 +889,9 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         if(myCollectInAdvanceQueryDto.getTransactionType()==null || "".equals(myCollectInAdvanceQueryDto.getTransactionType())){
             myCollectInAdvanceQueryDto.setTransactionType("1");
         }
+        if(StringUtils.isEmpty(myCollectInAdvanceQueryDto.getAuditstatus())){
+            myCollectInAdvanceQueryDto.setAuditstatus("0");
+        }
         Page<MyCollectInAdvanceDto> page = new Page<>(myCollectInAdvanceQueryDto.getPageNum(), myCollectInAdvanceQueryDto.getPageSize());
        // page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
         Page<MyCollectInAdvanceDto> orderVoPage = new Page<>();

+ 1 - 0
src/main/resources/mapper/modules/ins/InsFeeOrderNewMapper.xml

@@ -650,6 +650,7 @@
             <if test="myCollectInAdvanceQueryDto.startDate!= null  and  myCollectInAdvanceQueryDto.startDate  !='' and myCollectInAdvanceQueryDto.endDate!= null  and  myCollectInAdvanceQueryDto.endDate  !=''">
                 AND ins.createtime  BETWEEN #{myCollectInAdvanceQueryDto.startDate} AND #{myCollectInAdvanceQueryDto.endDate}
             </if>
+
         </where>
     </select>
     <select id="findMyCollectInAdvanceWillAmountByUserIdCount" resultType="java.lang.Long">