修改bug

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/EquipmentCategoryController.java

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+import com.yeejoin.amos.boot.module.ymt.api.common.CommonException;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipExportDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
@@ -451,9 +452,11 @@ public class EquipmentCategoryController extends BaseController {
 		JSONObject jsonObject = new JSONObject(map);
 		Page<JSONObject> pageList = equipmentCategoryServiceImpl.queryByKeys(jsonObject);
 		List<JSONObject> equipExportData;
+		List<String> strings = null;
 		if (map.containsKey("ids") && !ObjectUtils.isEmpty(map.get("ids"))) {
-			List<String> strings = Arrays.asList(String.valueOf(map.get("ids")).split(","));
-			equipExportData = pageList.getRecords().stream().filter(item -> strings.contains(String.valueOf(item.get("SEQUENCE_NBR")))).collect(Collectors.toList());
+			strings  = Arrays.asList(String.valueOf(map.get("ids")).split(","));
+			List<String> finalStrings = strings;
+			equipExportData = pageList.getRecords().stream().filter(item -> finalStrings.contains(String.valueOf(item.get("SEQUENCE_NBR")))).collect(Collectors.toList());
 		} else {
 			equipExportData = pageList.getRecords();
 		}
@@ -473,8 +476,11 @@ public class EquipmentCategoryController extends BaseController {
 			lambda.eq(IdxBizJgOtherInfo::getClaimStatus, "已认领");
 			lambda.in(IdxBizJgOtherInfo::getCode96333, code96333);
 			Integer integer = idxBizJgOtherInfoMapper.selectCount(lambda);
-			if (!map.get("size").equals(String.valueOf(integer))) {
-				throw new BadRequest("存在重复数据，请联系管理员！");
+			if (!ObjectUtils.isEmpty(strings) && strings.size() != integer){
+				throw new BadRequest("96333码存在重复数据，请联系管理员！");
+			}
+			if (ObjectUtils.isEmpty(strings) && !map.get("size").equals(String.valueOf(integer))) {
+				throw new BadRequest("96333码存在重复数据，请联系管理员！");
 			}
 		}
 		List<Object> supervisoryCode = equipExportData.stream().filter(item -> !ObjectUtils.isEmpty(item.get("SUPERVISORY_CODE"))).map(item -> item.get("SUPERVISORY_CODE")).collect(Collectors.toList());
@@ -483,8 +489,11 @@ public class EquipmentCategoryController extends BaseController {
 			lambda.eq(IdxBizJgOtherInfo::getClaimStatus, "已认领");
 			lambda.in(IdxBizJgOtherInfo::getSupervisoryCode, supervisoryCode);
 			Integer integer = idxBizJgOtherInfoMapper.selectCount(lambda);
-			if (!map.get("size").equals(String.valueOf(integer))) {
-				throw new BadRequest("存在重复数据，请联系管理员！");
+			if (!ObjectUtils.isEmpty(strings) && strings.size() != integer){
+				throw new BadRequest("监管码存在重复数据，请联系管理员！");
+			}
+			if (ObjectUtils.isEmpty(strings) && !map.get("size").equals(String.valueOf(integer))) {
+				throw new BadRequest("监管码存在重复数据，请联系管理员！");
 			}
 		}
 		if (ImageSizeEnums.DT.getCode().equals(type)) {