账本列表

src/main/java/com/winhc/repal/repository/RepalBookMapper.java

@@ -19,14 +19,16 @@ public interface RepalBookMapper extends BaseMapper<RepalBook> {
 
     /**
      * 获取账本count和name
+     * @param userId userId
      * @param repalGroupId repalGroupId
      * @param receivableFlag receivableFlag
      * @param receiptFlag receiptFlag
      * @return java.util.List<com.winhc.repal.model.vo.RepalBookInfoVO>
      * @author xda
-     * @date 2022/5/5 13:56
+     * @date 2022/5/5 17:40
      */
-    List<RepalBookInfoVO> getRepalBookInfoList(@Param("repalGroupId") Long repalGroupId,
+    List<RepalBookInfoVO> getRepalBookInfoList(@Param("userId") Long userId,
+                                               @Param("repalGroupId") Long repalGroupId,
                                                @Param("receivableFlag") Boolean receivableFlag,
                                                @Param("receiptFlag") Boolean receiptFlag);
 

src/main/java/com/winhc/repal/service/impl/RepalBookServiceImpl.java

@@ -70,10 +70,6 @@ public class RepalBookServiceImpl extends ServiceImpl<RepalBookMapper, RepalBook
         Set<String> codeSet = repalRolePermissionService.getUserPermissionCodeSet(UserContextUtil.getUser().getUserId());
         boolean receivableFlag = codeSet.contains(PermissionEnum.QUERY_ALL_RECEIVABLE.getCode());
         boolean receiptFlag = codeSet.contains(PermissionEnum.QUERY_ALL_RECEIPT.getCode());
-        if (receivableFlag && receiptFlag) {
-            // 查看全部
-            //repalBookMapper.getRepalBookInfoList(repalBookGroupId);
-        }
-        return new ArrayList<>();
+        return repalBookMapper.getRepalBookInfoList(UserContextUtil.getUser().getUserId(), repalBookGroupId, receivableFlag, receiptFlag);
     }
 }

src/main/resources/mapper/RepalBookMapper.xml

@@ -9,13 +9,15 @@
         LEFT JOIN REPAL_BOOK AS repalBook ON repalBill.REPAL_GROUP_ID = repalBook.ID
         WHERE repalBill.REPAL_GROUP_ID = #{repalGroupId} AND
             <if test="!receivableFlag or !receiptFlag">
-                <if test="!receivableFlag">
-                    (repalBill.REPAL_BILL_TYPE = )
+                <if test="!receivableFlag and !receiptFlag">
+                    rPerson.USER = #{userId} AND
+                </if>
+                <if test="!receiptFlag and receiptFlag">
+                    ((repalBill.REPAL_BILL_TYPE = 1 AND rPerson.USER = #{userId}) or repalBill.REPAL_BILL_TYPE = 2) AND
+                </if>
+                <if test="receiptFlag and !receiptFlag">
+                    ((repalBill.REPAL_BILL_TYPE = 2 AND rPerson.USER = #{userId}) or repalBill.REPAL_BILL_TYPE = 1) AND
                 </if>
-
-
-
-
             </if>
               repalBill.DELETED = 0)
         AS tmp