From 448f0e9e961101c79d7d9a23179cf394b5832ca3 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Wed, 3 Dec 2025 20:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/mybatis/newInput/NewInputMapper.xml | 14 +++++++++++++-
 resources/mybatis/sys/UserMapper.xml          |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/resources/mybatis/newInput/NewInputMapper.xml b/resources/mybatis/newInput/NewInputMapper.xml
index 12d61c5..ae2601f 100644
--- a/resources/mybatis/newInput/NewInputMapper.xml
+++ b/resources/mybatis/newInput/NewInputMapper.xml
@@ -220,7 +220,19 @@
 		FROM mm_newinput 
 		WHERE TASK_ID = #{id}
 	</select>
-	
+
+	<select id="getNewInputByTaskId" resultType="com.bonus.newInput.beans.NewInputBean">
+		SELECT
+			id,
+			TASK_ID as taskId,
+			TASK_STATUS as taskStatus,
+			IS_SURE as isSure
+		FROM
+			wf_task_appoint
+		WHERE
+			TASK_ID = #{taskId}
+	</select>
+
 	<delete id="deleteMachine" parameterType="com.bonus.newInput.beans.NewInputBean">
 		delete from mm_machines  
 		where ID = #{maId}
diff --git a/resources/mybatis/sys/UserMapper.xml b/resources/mybatis/sys/UserMapper.xml
index 2854fe4..6c6e38c 100644
--- a/resources/mybatis/sys/UserMapper.xml
+++ b/resources/mybatis/sys/UserMapper.xml
@@ -57,7 +57,7 @@
 		<if test="name != null and name != ''">
 			and `NAME` like concat('%',#{name},'%')
 		</if>
-		<if test="companyId != 1 and companyId != '1'">
+		<if test="companyId != null and companyId != 1 and companyId != '1'">
 			AND COMPANY_ID = #{companyId}
 		</if>
 	</select>