From 76b573ef2fb61daa7894877ae3ad1bacf4c5db39 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 29 十月 2025 10:57:24 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/ImagePreviewController.java | 1 -
src/main/java/com/zy/common/service/CommonService.java | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ImagePreviewController.java b/src/main/java/com/zy/asrs/controller/ImagePreviewController.java
index 71d1ee4..4734fc6 100644
--- a/src/main/java/com/zy/asrs/controller/ImagePreviewController.java
+++ b/src/main/java/com/zy/asrs/controller/ImagePreviewController.java
@@ -1,7 +1,6 @@
package com.zy.asrs.controller;
import com.core.common.R;
-import com.sun.prism.Image;
import com.zy.asrs.entity.ImageView;
import com.zy.asrs.utils.ImagePreviewUtils;
import com.zy.common.web.BaseController;
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 5afb923..6811548 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -316,7 +316,7 @@
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").eq("loc_type2",locTypeDto.getLocType2()));
List<LocMast> locMastList = new ArrayList<>();
locMasts.sort(new Comparator<LocMast>() {
@Override
--
Gitblit v1.9.1