修改查询

src/main/java/com/archser/aserver/service/HelperService.java

@@ -5,6 +5,7 @@ import com.archser.aserver.util.DownLoadFileUtil;
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.PathKit;
 import com.jfinal.kit.Ret;
+import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
@@ -27,8 +28,14 @@ public class HelperService {
       type = "0";
     } else if("使用手册".contains(searchText)) {
       type = "1";
+    } else if("操作视频".contains(searchText)) {
+      type = "2";
+    }
+	  //修改查询 ChengYaqing 20210325
+    searchText = "name like '%"+searchText+"%' or description like '%"+searchText+"%'";
+	  if (StrKit.notBlank(type)) {
+	    searchText = searchText + "or type = '"+type+"'";
     }
-    searchText = type.equals("")?"": "name like '%"+searchText+"%' or type = '"+type+"' or description like '%"+searchText+"%'";
     Page<Helper> page = Helper.dao.paginate(pageNumber, pageSize, Db.getSqlPara("getHelperList",Kv.by("searchText",searchText)));
     return page;
   }