Browse Source

2022年10月11日09:37:55

纪新园 2 năm trước cách đây
mục cha
commit
824a31b493

+ 3 - 3
ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TWarehouseWebcam.java

@@ -63,7 +63,7 @@ public class TWarehouseWebcam extends BaseEntity {
      * 库位id
      */
     @Excel(name = "库位id")
-    private Long libraryPositionId;
+    private String libraryPositionId;
 
     /**
      * 库位
@@ -71,11 +71,11 @@ public class TWarehouseWebcam extends BaseEntity {
     @Excel(name = "库位")
     private String libraryPosition;
 
-    public Long getLibraryPositionId() {
+    public String getLibraryPositionId() {
         return libraryPositionId;
     }
 
-    public void setLibraryPositionId(Long libraryPositionId) {
+    public void setLibraryPositionId(String libraryPositionId) {
         this.libraryPositionId = libraryPositionId;
     }
 

+ 1 - 1
ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseWebcamMapper.xml

@@ -53,7 +53,7 @@
             <if test="fWarehouseName != null  and fWarehouseName != ''">and f_warehouse_name like concat('%',
                 #{fWarehouseName}, '%')
             </if>
-            <if test="libraryPositionId != null">and library_position_id = #{libraryPositionId}</if>
+            <if test="libraryPositionId != null">and find_in_set(library_position_id,#{libraryPositionId})</if>
             <if test="libraryPosition != null  and libraryPosition != ''">and library_position like concat('%',
                 #{libraryPosition}, '%')
             </if>