后台修改3

huimv-receive/src/main/java/com/huimv/receive/config/InterceptorConfig.java

@@ -30,6 +30,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         ,"/secureApi/bill-isolate/printIsolate"
                         ,"/secureApi/bill-luggage/printLuggage"
                         ,"/secureApi/admin/user/printUser"
-                        ,"/secureApi/admin/accountMultilevel/printAccount");
+                        ,"/secureApi/admin/accountMultilevel/printAccount"
+                        ,"/secureApi/base-device/printDevice");
     }
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseDeviceServiceImpl.java

@@ -99,7 +99,7 @@ public class BaseDeviceServiceImpl extends ServiceImpl<BaseDeviceMapper, BaseDev
             queryWrapper.and(i -> i.like("device_code", word)
                     .or().like( "device_name", word));
         }
-        queryWrapper.eq("work_location_type", locationId);
+        queryWrapper.eq(StringUtils.isNotBlank(locationId),"work_location_type", locationId);
         Page<BaseDevice> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, deviceMapper.selectPage(page, queryWrapper));
     }