From 0b375888545f5a824f1694d35ce0e16b9daf5a87 Mon Sep 17 00:00:00 2001
From: csyue <1203338439@qq.com>
Date: Tue, 28 May 2024 09:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E9=A1=B9?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/sgzb/auth/service/SysLoginService.java    | 2 +-
 .../com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java   | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java
index 0ff43bbd..7341ecfc 100644
--- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java
+++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java
@@ -75,7 +75,7 @@ public class SysLoginService {
 
         if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
-            throw new ServiceException("登录用户：" + username + " 不存在");
+            throw new ServiceException("用户不存在/密码错误");
         }
 
         if (R.FAIL == userResult.getCode()) {
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index 505f1e27..c0895487 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -654,11 +654,6 @@ public class TmTaskServiceImpl implements TmTaskService {
                             }
                         }
                     }
-                    // 存入领料任务实体集合
-                    tmTask.setLeaseApplyInfoList(collect);
-                    if (collect.size() > 0) {
-                        tmTask.setRemark(collect.get(0).getRemark());
-                    }
                 }
                 //施管部只能看到机具分公司（101）的数据
                 if (roles.contains("jjfgs") || roles.contains("sgb") || deptId == 101) {