diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/address/service/impl/AddressServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/address/service/impl/AddressServiceImpl.java index de0c83a..eef527b 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/address/service/impl/AddressServiceImpl.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/address/service/impl/AddressServiceImpl.java @@ -23,7 +23,8 @@ public class AddressServiceImpl extends ServiceImpl<AddressMapper, Address> impl public Address getAddressByUrl(String url, String warehouseCode) { LambdaQueryWrapper<Address> addressLambdaQueryWrapper = Wrappers.lambdaQuery(); addressLambdaQueryWrapper.eq(Address::getUrl, url) - .eq(Address::getWarehouseCode, warehouseCode); + .eq(Address::getWarehouseCode, warehouseCode) + .last(" limit 1"); Address address = getOne(addressLambdaQueryWrapper); return address; } diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/framework/aspectj/ApiLogAspect.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/framework/aspectj/ApiLogAspect.java index eb00328..8ebadc2 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/framework/aspectj/ApiLogAspect.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/framework/aspectj/ApiLogAspect.java @@ -471,11 +471,19 @@ public class ApiLogAspect for (int i = 0; i < m.getParameterNames().length; i++) { String name = m.getParameterNames()[i]; // Class type = m.getParameterTypes()[i]; - map.put(name, args[i]); + if(args[i] instanceof HttpServletRequest){ + continue; + } else { + map.put(name, args[i]); + } } if(!map.isEmpty()) { - log.setRequestBody(JSONObject.toJSONString(map)); + if(map.keySet().size() == 1) { + log.setRequestBody(JSONObject.toJSONString(map.values().iterator().next())); + }else{ + log.setRequestBody(JSONObject.toJSONString(map)); + } } }catch (Exception e){ e.printStackTrace();