|
@@ -8,6 +8,7 @@ import com.huimv.cattle.mapper.StockMapper;
|
|
import com.huimv.cattle.service.StockService;
|
|
import com.huimv.cattle.service.StockService;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.huimv.cattle.token.TokenSign;
|
|
import com.huimv.cattle.token.TokenSign;
|
|
|
|
+import com.huimv.cattle.utils.FarmCodeUtils;
|
|
import com.huimv.common.utils.Result;
|
|
import com.huimv.common.utils.Result;
|
|
import com.huimv.common.utils.ResultCode;
|
|
import com.huimv.common.utils.ResultCode;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -35,9 +36,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
|
|
public Result getStock(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
public Result getStock(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
// Stock stock = stockMapper.getList();
|
|
// Stock stock = stockMapper.getList();
|
|
String farmCode =paramsMap.get("farmCode");
|
|
String farmCode =paramsMap.get("farmCode");
|
|
- if (farmCode==null) {
|
|
|
|
- farmCode = httpServletRequest.getHeader("farmCode");
|
|
|
|
- }
|
|
|
|
|
|
+ farmCode = FarmCodeUtils.getFarmCode(farmCode, httpServletRequest);
|
|
QueryWrapper<Stock> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<Stock> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.eq("farm_code", farmCode);
|
|
queryWrapper.eq("farm_code", farmCode);
|
|
Stock stock = stockMapper.selectOne(queryWrapper);
|
|
Stock stock = stockMapper.selectOne(queryWrapper);
|