Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -137,9 +137,10 @@ public class FireFightingSystemController extends AbstractBaseController {
     @RequestMapping(value = "/getEquipCountPageBySystemId", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation("根据系统id查询分组设备数量")
-    public Page<EquipCountBySystemVO> getEquipCountPageBySystemId(@RequestParam("systemId") Long systemId,
-                                                              @RequestParam(value = "pageNumber", required = false) Integer pageNumber,
-                                                              @RequestParam(value = "pageSize", required = false) Integer pageSize
+    public Page<EquipCountBySystemVO> getEquipCountPageBySystemId(
+            @RequestParam(value = "systemId", required = false) Long systemId,
+            @RequestParam(value = "pageNumber", required = false) Integer pageNumber,
+            @RequestParam(value = "pageSize", required = false) Integer pageSize
     ) {
         return fireFightingSystemService.getEquipCountPageBySystemId(systemId, pageNumber, pageSize);
     }

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -125,8 +125,11 @@
                 LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
                 LEFT JOIN wl_equipment_category cate ON cate.id = wle.category_id
                 LEFT JOIN wl_unit as unit ON wle.unit_id = unit.id
-        where
-            find_in_set(#{systemId},spe.system_id) and spe.single = true
+        <where>
+            <if test="systemId != null and systemId != ''">
+                find_in_set(#{systemId},spe.system_id) and spe.single = true
+            </if>
+        </where>
         group by wle.id
     </select>
     <insert id="save">