解决冲突

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

@@ -1116,11 +1116,11 @@ public class BookBizImpl implements BookBiz {
     @Override
     public PageBean listPage4Agent(PageParam pageParam, Map<String, Object> paramMap, Long agentId) {
         LOGGER.info("书刊列表-出版端,<START>.[paramMap]=" + paramMap + ",agentId" + agentId);
-        List<Long> adviserIds = adviserConsr.getIdsByNameAndAgentId(agentId, (String) paramMap.get("mainEditorName"));
+        List<Long> adviserIds = adviserConsr.getIdsByNameAndAgentId(agentId, (String) paramMap.get("bookName"));
         paramMap.put("adviserIds", adviserIds);
-        if (ListUtils.isEmpty(adviserIds)) {
+        /*if (ListUtils.isEmpty(adviserIds)) {
             return new PageBean(0, 0, new ArrayList<>());
-        }
+        }*/
         PageBean pageBean = bookDao.listPage(pageParam, paramMap, "listPage4Agent");
         if (pageBean == null || ListUtils.isEmpty(pageBean.getRecordList())) {
             return new PageBean();

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

@@ -431,9 +431,10 @@ public class BookGuideBizImpl implements BookGuideBiz {
 
     @ParamLog("推关学习报告/猜谜语关键词消息")
     private KeywordStatusDTO pushLearningReport(GroupClassifyQrcodeDTO classifyQrcodeInfo, String robotId, String weixinGroupId, String ip) {
-        Boolean reportOpen = false;
-        Boolean riddleOpen = false;
-        Boolean clockOpen = false;
+        boolean reportOpen = false;
+        boolean riddleOpen = false;
+        boolean clockOpen = false;
+        KeywordStatusDTO dto = new KeywordStatusDTO();
         if (classifyQrcodeInfo.getHasOpenLearningReport() != null && classifyQrcodeInfo.getHasOpenLearningReport()) {
             reportOpen = true;
         }
@@ -444,12 +445,12 @@ public class BookGuideBizImpl implements BookGuideBiz {
         WeixinClockDto weixinClockDto = weixinClockGroupClassifyDao.getClockBaseInfoByClassify(classifyQrcodeInfo.getClassifyId());
         if (null != weixinClockDto && !StringUtil.isEmpty(weixinClockDto.getClockGuide()) && !StringUtil.isEmpty(weixinClockDto.getClockKeyword())) {
             clockOpen = true;
+            dto.setClockGuide(weixinClockDto.getClockGuide());
+            dto.setClockKeyword(weixinClockDto.getClockKeyword());
         }
-        KeywordStatusDTO dto = new KeywordStatusDTO();
         dto.setReportOpen(reportOpen);
         dto.setRiddleOpen(riddleOpen);
         dto.setClockOpen(clockOpen);
-        dto.setClockKeyword(null == weixinClockDto ? StringUtil.EMPTY : weixinClockDto.getClockKeyword());
         return dto;
 //        if (reportOpen && riddleOpen && clockOpen) {
 //            SendWeixinRequestTools.sendTextMessage("关键词【学习报告】\n    获取个人专属学习报告，与群成员PK元气值\n" +

pcloud-service-book/src/main/java/com/pcloud/book/keywords/dto/KeywordStatusDTO.java

@@ -23,4 +23,9 @@ public class KeywordStatusDTO {
      */
     private String clockKeyword;
 
+    /**
+     * 打卡引导语
+     */
+    private String clockGuide;
+
 }

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

@@ -637,6 +637,8 @@
         AND b.IS_DELETE = 0
         AND bg.IS_DELETE = 0
 		AND bgc.is_delete = 0
+		AND b.BOOK_NAME NOT LIKE CONCAT('%','红榜','%')
+		AND CHAR_LENGTH(b.BOOK_NAME)>=8
 		GROUP BY b.BOOK_ID
 		ORDER BY bg.create_time DESC
 	</select>
@@ -1073,11 +1075,6 @@
 			BOOK B
 		ON
 			A.BOOK_ID = B.BOOK_ID  AND A.IS_DELETE = 0 AND B.IS_DELETE = 0
-		AND 
-			A.ADVISER_ID IN
-			<foreach collection="adviserIds" index="i" item="item" open="(" separator="," close=")">
-				${item}
-			</foreach>
 		AND A.IS_MAIN_EDITOR = 1
 		LEFT JOIN
 			BOOK_TYPE T
@@ -1098,8 +1095,16 @@
 			A.CHANNEL_ID = #{channelId}
 		</if>
 		<if test="bookName!=null">
-		AND
-			B.BOOK_NAME LIKE CONCAT('%',#{bookName},'%')
+		AND (B.BOOK_NAME LIKE CONCAT('%',#{bookName},'%')
+			OR B.ISBN LIKE CONCAT(#{bookName},'%')
+			<if test="adviserIds!=null and adviserIds.size()>0">
+				OR
+				A.ADVISER_ID in
+				<foreach collection="adviserIds" item="item" open="(" separator="," close=")">
+					${item}
+				</foreach>
+			</if>
+			)
 		</if>
 		<if test="isbn!=null">
 		AND