Merge branch 'feat-fix500-2' into 'master'

fix500-2

See merge request rays/pcloud-book!336

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/SelfRobotKeywordBizImpl.java

@@ -290,10 +290,15 @@ public class SelfRobotKeywordBizImpl implements SelfRobotKeywordBiz {
         if (selfRobotKeyword.getId()==null){
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, "id不能为空！");
         }
-        List<String> keywords = selfRobotKeywordDao.getKeywords(selfRobotKeyword.getBookGroupId());
-        if (!ListUtils.isEmpty(keywords)&&keywords.contains(selfRobotKeyword.getKeyword())){
+        List<SelfRobotKeyword> keywords = selfRobotKeywordDao.getListByBookGroupId(selfRobotKeyword.getBookGroupId());
+        if (!ListUtils.isEmpty(keywords)){
+            for (SelfRobotKeyword robotKeyword:keywords){
+                if (robotKeyword.getBookGroupId()!=selfRobotKeyword.getBookGroupId()
+                        &&robotKeyword.getKeyword().equals(selfRobotKeyword.getKeyword())){
                     throw new BookBizException(BookBizException.PARAM_IS_ERROR, "关键词不能重复！");
                 }
+            }
+        }
         checkAddSelfRobotKeyword(selfRobotKeyword);
     }