修改器材列表bug

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

@@ -9,6 +9,7 @@ import com.yeejoin.equipmanage.common.entity.dto.FireResourceStatsDTO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
+import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.config.PersonIdentify;
 import com.yeejoin.equipmanage.service.IEmergencyService;
 import io.swagger.annotations.Api;
@@ -776,7 +777,7 @@ public class EmergencyController extends AbstractBaseController {
 	@ApiOperation("设备平台详情设备列表")
 	@PostMapping(value = "/equip/list")
 	public IPage<EquipTypeImgAmountVO> getMaterialList(@RequestBody EquipTypeAmountPageDTO equipTypeAmountPage)  {
-		if (StringUtils.isEmpty(equipTypeAmountPage.getEquipCodeKey())) {
+		if (StringUtils.isEmpty(equipTypeAmountPage.getEquipCodeKey()) && StringUtils.isEmpty(equipTypeAmountPage.getSixEquipType())) {
 			return new Page<>();
 		}
 		String bizOrgCode = equipTypeAmountPage.getBizOrgCode();

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

@@ -1595,6 +1595,8 @@
         FROM
         wl_equipment_specific wes
         LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
+        LEFT JOIN wl_equipment e ON e.id = wed.equipment_id
+        LEFT JOIN wl_equipment_category c ON c.id = e.category_id
         WHERE
             <if test="list != null and list.size > 0">
                 <foreach collection="list" item="item" index="index" open="(" close=")" separator="OR">