Merge branch 'fixbug/fixadviserBook' into 'master'

bug:[none]fixAdviserBook

See merge request rays/pcloud-book!1298

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java

@@ -29,6 +29,7 @@ import com.pcloud.common.permission.Permission;
 import com.pcloud.common.permission.PermissionCode.ServerPermissionCode;
 import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.ListUtils;
+import com.pcloud.common.utils.NumberUtil;
 import com.pcloud.common.utils.SessionUtil;
 import com.pcloud.common.utils.cookie.Cookie;
 import com.pcloud.common.utils.nginx.NginxUtils;
@@ -291,6 +292,13 @@ public class BookFacadeImpl implements BookFacade {
             throw BookBizException.PAGE_PARAM_DELETION;
         }
         Map<String, Object> paramMap = new HashMap<>();
+        //处理name
+        if (!StringUtil.isEmpty(name) && (name.startsWith("BK") || name.startsWith("bk")) && name.length() > 2) {
+            String substring = name.substring(2);
+            if (!StringUtil.isEmpty(substring) && NumberUtil.isNumber(substring)) {
+                name = substring;
+            }
+        }
         paramMap.put("adviserId", adviserId);
         paramMap.put("isMainEditor", isMainEditor);
         paramMap.put("isFundSupport", isFundSupport);

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -567,7 +567,7 @@
 		<if test="name != null">
 			AND
 			(
-			(B.BOOK_NAME LIKE CONCAT('%', #{name}, '%') OR  B.ISBN LIKE CONCAT(#{name},'%') OR CONCAT('BK',A.BOOK_ID) = #{name})
+			(B.BOOK_NAME LIKE CONCAT('%', #{name}, '%') OR  B.ISBN LIKE CONCAT(#{name},'%') OR A.BOOK_ID = #{name})
 			<if test="nameList != null and nameList.size > 0">
 				or
 				(