项目空指针异常处理

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/dao/UseMoneyDao.java

@@ -58,7 +58,7 @@ public interface UseMoneyDao extends BaseMapperX<UseMoneyDO> {
                 .in(UseMoneyDO::getFlowStatus, FLOW_FINISHED, FLOW_PAYMENT)
                 .and(wq -> wq.in(UseMoneyDO::getDeptId, deptIds)
                         .or()
-                        .in(UseMoneyDO::getProjectId, projectIds))
+                        .in(projectIds.size()>0,UseMoneyDO::getProjectId, projectIds))
                 .orderByDesc(UseMoneyDO::getApplyTime));
     }
 
@@ -67,7 +67,7 @@ public interface UseMoneyDao extends BaseMapperX<UseMoneyDO> {
                 .in(UseMoneyDO::getFlowStatus, FLOW_FINISHED, FLOW_PAYMENT)
                 .and(wq -> wq.eq(UseMoneyDO::getDeptId, pageReqVO.getDeptId())
                         .or()
-                        .in(UseMoneyDO::getProjectId, projectIds))
+                        .in(projectIds.size()>0,UseMoneyDO::getProjectId, projectIds))
                 .orderByDesc(UseMoneyDO::getApplyTime));
     }
 

zjugis-business/src/main/resources/mapper/oracle/AssetProcureDetailMapper.xml

@@ -58,16 +58,18 @@
                 <foreach collection="params.deptIdList" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
+                <if test="params != null  and params.projectIdLists != null and params.projectIdLists.size > 0">
                     or
-                T.project_id in
-                <foreach collection="params.projectIdLists" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-                or
-                T1.project_id in
-                <foreach collection="params.projectIdLists" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
+                    T.project_id in
+                    <foreach collection="params.projectIdLists" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    or
+                    T1.project_id in
+                    <foreach collection="params.projectIdLists" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
                 )
             </if>
             <if test="params != null  and params.projectIdList != null  and params.projectIdList.size > 0">

zjugis-business/src/main/resources/mapper/oracle/LoanMapper.xml

@@ -35,9 +35,8 @@
                 <foreach collection="params.UserDeptList" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
-                    or
                 <if test="params != null  and params.projectIds != null and params.projectIds.size > 0">
-                     L.project_id in
+                    or L.project_id in
                     <foreach collection="params.projectIds" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
@@ -100,9 +99,9 @@
                 <foreach collection="params.UserDeptList" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
-                or
+
                 <if test="params != null  and params.projectIds != null and params.projectIds.size > 0">
-                    L.project_id in
+                    or  L.project_id in
                     <foreach collection="params.projectIds" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>