修改查询逻辑

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantProxyDividendServiceImpl.java

@@ -22,10 +22,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.BiConsumer;
 
 /**
@@ -82,7 +79,9 @@ public class TenantProxyDividendServiceImpl extends ServiceImpl<TenantProxyDivid
                 .le(TenantPreJoin::getCreatedTime, param.get("endData")));
         if (CollectionUtils.isNotEmpty(preJoinsList)) {
             result.setTenantAgency(preJoinsList.size());
-            long count = preJoinsList.stream().filter(a -> a.getState() == 1).count();
+            long count = preJoinsList.stream()
+                    .filter(a -> Objects.nonNull(a.getState()) && a.getState() == 1)
+                    .count();
             result.setPreTenant((int) count);
         }
 

mec-biz/src/main/resources/config/mybatis/TenantProxyDividendMapper.xml

@@ -24,7 +24,7 @@
         </foreach>
     </insert>
 
-    <select id="queryProxyDividendInfo" resultType="com.ym.mec.biz.dal.vo.ProxyDividendVo$ProxyDividendInfoVo">
+    <select id="queryProxyDividendInfo"  parameterType="map" resultType="com.ym.mec.biz.dal.vo.ProxyDividendVo$ProxyDividendInfoVo">
         select a.proxy_id_ as proxyId,
         b.proxy_name_ as proxyName,
         c.id_ as tenantId,
@@ -43,11 +43,11 @@
             <if test="param.recommenderId != null">
                 AND c.recommender_ = #{param.recommenderId}
             </if>
-            <if test="param.startData != null">
-                AND a.active_time_ <![CDATA[ >= ]]> #{param.startDate}
+            <if test="param.startData != null and param.startData != ''">
+                AND a.active_time_ <![CDATA[ >= ]]> #{param.startData}
             </if>
-            <if test="param.endData != null">
-                AND a.active_time_ <![CDATA[ <= ]]> #{param.endDate}
+            <if test="param.endData != null and param.endData != ''">
+                AND a.active_time_ <![CDATA[ <= ]]> #{param.endData}
             </if>
         </where>
     </select>
@@ -65,11 +65,11 @@
             <if test="param.recommenderId != null">
                 AND c.recommender_ = #{param.recommenderId}
             </if>
-            <if test="param.startData != null">
-                AND a.active_time_ <![CDATA[ >= ]]> #{param.startDate}
+            <if test="param.startData != null and param.startData != ''">
+                AND a.active_time_ <![CDATA[ >= ]]> #{param.startData}
             </if>
-            <if test="param.endData != null">
-                AND a.active_time_ <![CDATA[ <= ]]> #{param.endDate}
+            <if test="param.endData != null and param.endData != ''">
+                AND a.active_time_ <![CDATA[ <= ]]> #{param.endData}
             </if>
         </where>
     </select>

mec-biz/src/main/resources/config/mybatis/TenantProxyInfoMapper.xml

@@ -60,7 +60,7 @@
         where a.parent_id_ = #{id}
     </select>
 
-    <select id="queryProxyUser" resultType="com.ym.mec.biz.dal.vo.ProxyUserVo">
+    <select id="queryProxyUser" parameterType="map" resultType="com.ym.mec.biz.dal.vo.ProxyUserVo">
         select
             b.id_ as userId,
             c.id_ as proxyId,
@@ -87,7 +87,7 @@
         </where>
     </select>
 
-    <select id="queryUserList" resultType="com.ym.mec.auth.api.entity.SysUser">
+    <select id="queryUserList" parameterType="map" resultType="com.ym.mec.auth.api.entity.SysUser">
         select id_ as id,
                real_name_ as realName,
                phone_ as phone