From 2d5577f5c3ac11f5762384799da2376d280a033e Mon Sep 17 00:00:00 2001
From: ljt <18301674552@163.com>
Date: Fri, 22 Mar 2024 13:22:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81=E6=95=88?=
 =?UTF-8?q?=E9=AA=8C=E8=BF=94=E5=9B=9Eerror=E5=A2=9E=E5=8A=A0=E3=80=81?=
 =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/controller/OcrSUserTController.java      | 16 ++++++++--------
 .../mapper/oa/OcrSearchHistoryMapper.xml         |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java
index a797b566..4f3736b1 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java
@@ -131,40 +131,40 @@ public class OcrSUserTController {
                                         return ResultVoUtil.success(ResultVo.SUCCESS,list);
                                     }else {
 //                                        return  new ResponseEntity<Object>("验证码错误！",HttpStatus.OK);
-                                        return ResultVoUtil.error(ResultVo.SUCCESS,"验证码错误！");
+                                        return ResultVoUtil.error(ResultVo.ERROR,"验证码错误！");
                                     }
                                 }else {
 //                                    return  new ResponseEntity<Object>("手机号错误！",HttpStatus.OK);
-                                    return ResultVoUtil.error(ResultVo.SUCCESS,"手机号错误！");
+                                    return ResultVoUtil.error(ResultVo.ERROR,"手机号错误！");
                                 }
 
                             }else {
 //                                return  new ResponseEntity<Object>("账号不存在！",HttpStatus.OK);
-                                return ResultVoUtil.error(ResultVo.SUCCESS,"账号不存在！");
+                                return ResultVoUtil.error(ResultVo.ERROR,"账号不存在！");
                             }
 
 
                         }else {
 //                            return  new ResponseEntity<Object>("企业编码错误！",HttpStatus.OK);
-                            return ResultVoUtil.error(ResultVo.SUCCESS,"企业编码错误！");
+                            return ResultVoUtil.error(ResultVo.ERROR,"企业编码错误！");
                         }
 
                     }else {
 //                        return  new ResponseEntity<Object>("请输入企业编码！",HttpStatus.OK);
-                        return ResultVoUtil.error(ResultVo.SUCCESS,"请输入企业编码！");
+                        return ResultVoUtil.error(ResultVo.ERROR,"请输入企业编码！");
                     }
                 }else {
 //                    return  new ResponseEntity<Object>("请输入验证码！",HttpStatus.OK);
-                    return ResultVoUtil.error(ResultVo.SUCCESS,"请输入验证码！");
+                    return ResultVoUtil.error(ResultVo.ERROR,"请输入验证码！");
                 }
             }else {
 //                return  new ResponseEntity<Object>("请输入手机号！",HttpStatus.OK);
-                return ResultVoUtil.error(ResultVo.SUCCESS,"请输入手机号！");
+                return ResultVoUtil.error(ResultVo.ERROR,"请输入手机号！");
             }
         }else {
 
 //            return  new ResponseEntity<Object>("请输入账号！",HttpStatus.OK);
-            return ResultVoUtil.error(ResultVo.SUCCESS,"请输入账号！");
+            return ResultVoUtil.error(ResultVo.ERROR,"请输入账号！");
         }
 
 
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml
index bbbc2634..e1d13cb5 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml
@@ -23,7 +23,7 @@
 
     <select id="selectsearch2" resultType="map">
         SELECT
-            r.ID  as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name
+            r.ID  as id,CONCAT_WS( "-", t.packagename, img.planName ) AS name
         FROM
             ocr_taskchild_picture r
                 LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID
@@ -34,7 +34,7 @@
             r.STATES IN ('1','2') AND
            r.taskName IN ( '一级审批', '二级审批' )
           AND (r.PACKAGEID LIKE "%"#{search}"%"
-            OR img.taskName LIKE "%"#{search}"%"
+            OR t.packagename LIKE "%"#{search}"%"
             OR img.field1 LIKE "%"#{search}"%"
             OR img.field3 LIKE "%"#{search}"%")
         ORDER BY
@@ -43,7 +43,7 @@
     </select>
     <select id="selectsearch3" resultType="map">
         SELECT
-            r.ID as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name
+            r.ID as id,CONCAT_WS( "-", t.packagename, img.planName ) AS name
         FROM
             ocr_taskchild_picture r
                 LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID
@@ -54,7 +54,7 @@
             r.STATES = '3' AND
            r.taskName  = '最终审批'
           AND (r.PACKAGEID LIKE "%"#{search}"%"
-            OR img.taskName LIKE "%"#{search}"%"
+            OR t.packagename LIKE "%"#{search}"%"
             OR img.field1 LIKE "%"#{search}"%"
             OR img.field3 LIKE "%"#{search}"%")
         ORDER BY