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

修改

See merge request rays/pcloud-book!337

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

@@ -293,7 +293,7 @@ public class SelfRobotKeywordBizImpl implements SelfRobotKeywordBiz {
         List<SelfRobotKeyword> keywords = selfRobotKeywordDao.getListByBookGroupId(selfRobotKeyword.getBookGroupId());
         if (!ListUtils.isEmpty(keywords)){
             for (SelfRobotKeyword robotKeyword:keywords){
-                if (robotKeyword.getBookGroupId()!=selfRobotKeyword.getBookGroupId()
+                if (!robotKeyword.getBookGroupId().equals(selfRobotKeyword.getBookGroupId())
                         &&robotKeyword.getKeyword().equals(selfRobotKeyword.getKeyword())){
                     throw new BookBizException(BookBizException.PARAM_IS_ERROR, "关键词不能重复！");
                 }