Merge remote-tracking branch 'origin/master'

src/main/java/com/sztzjy/money_management/controller/CaseController.java

@@ -176,7 +176,7 @@ public class CaseController {
     @AnonymousAccess
     private ResultEntity<PageInfo<CaseInfo>> getCaseInfoList(@RequestParam Integer index,
                                                              @RequestParam Integer size,
-                                                             @RequestParam String schoolId,
+                                                             @RequestParam(required = false)  String schoolId,
                                                              @RequestParam(required = false) String keyWord,
                                                              @RequestParam(required = false) String type) {
         PageHelper.startPage(index, size);

src/main/resources/mapper/CaseInfoMapper.xml

@@ -351,7 +351,9 @@
     <select id="getCaseInfoList" resultMap="ResultMapWithBLOBs">
         SELECT * FROM case_info
         <where>
-            source IN ('999999999', #{schoolId})
+            <if test="schoolId != null and schoolId != ''">
+                AND source IN ('999999999', #{schoolId})
+            </if>
             <if test="keyWord != null and keyWord != ''">
                 AND
                 (customer_name LIKE CONCAT('%', #{keyWord}, '%') OR id_card LIKE CONCAT('%', #{keyWord}, '%'))