忘记密码效验返回error增加、综合搜索修改

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,"请输入账号！");
         }
 
 

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