From 2e2e572fad1a939b0e2c7589c852da598ad2c14a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 25 Jan 2024 13:44:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=8A=A0=E8=BD=BD=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E4=BC=98=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/mes/MesReportWorkConsumeMapper.xml    | 1 +
 .../src/main/java/com/op/open/service/impl/OpenServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
index 588831934..45bba0c25 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="attr3 != null  and attr3 != ''"> and attr3 = #{attr3}</if>
 			<if test="attr4 != null  and attr4 != ''"> and attr4 = #{attr4}</if>
 			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
+			<if test="recoil != null and recoil != ''"> and recoil = #{recoil}</if>
 			 and del_flag = '0'
 		</where>
 	</select>
diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
index a6c055a70..1d9d67cfc 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
@@ -466,7 +466,7 @@ public class OpenServiceImpl implements OpenService {
         try {
             StringBuilder postDataBuilder = new StringBuilder();
             postDataBuilder.append("createTime=").append("dateTime");
-            String result = HttpUtils.sendPost("http://lj.lanju.cn:8801/outside/api/mes/getUserList.do",postDataBuilder.toString());
+            String result = HttpUtils.sendPost(hr_url,postDataBuilder.toString());
             return success(result);
         } catch (Exception e) {
             e.printStackTrace();