Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/mapper/xml/MyNoticeListMapper.xml

@@ -164,7 +164,6 @@
 			a.del_flag = 0
 			and a.notice_id = #{noticeId}
 			and a.title like concat('%',#{title},'%')
-			and a.type = 0
 			ORDER BY a.create_time desc LIMIT 1
 		</where>
 	</select>

jeeplus-modules/jeeplus-xxl-job-executor-sample/src/main/java/com/xxl/job/executor/service/jobhandler/SampleXxlJob.java

@@ -820,8 +820,12 @@ public class SampleXxlJob {
                         map.put("myNoticeInfo", myNoticeInfo);
                         SpringUtil.getBean ( IFlowableApi.class ).insertMyNotice(map);
                     }else{
+                        if(null != repetitionCountBymyNotice.getRepetitionCount() && "0".equals(repetitionCountBymyNotice.getType())){
+                            myNotice.setRepetitionCount(repetitionCountBymyNotice.getRepetitionCount() + 1);
+                        }else{
+                            myNotice.setRepetitionCount(0);
+                        }
                         myNotice.setId(repetitionCountBymyNotice.getId());
-                        myNotice.setRepetitionCount(repetitionCountBymyNotice.getRepetitionCount()+1);
                         myNotice.setTitle(titleStr);
                         myNoticeInfo = JSON.toJSONString(myNotice);
                         map.put("myNoticeInfo", myNoticeInfo);
@@ -909,8 +913,12 @@ public class SampleXxlJob {
                         map.put("myNoticeInfo", myNoticeInfo);
                         SpringUtil.getBean ( IFlowableApi.class ).insertMyNotice(map);
                     }else{
+                        if(null != repetitionCountBymyNotice.getRepetitionCount() && "0".equals(repetitionCountBymyNotice.getType())){
+                            myNotice.setRepetitionCount(repetitionCountBymyNotice.getRepetitionCount() + 1);
+                        }else{
+                            myNotice.setRepetitionCount(0);
+                        }
                         myNotice.setId(repetitionCountBymyNotice.getId());
-                        myNotice.setRepetitionCount(repetitionCountBymyNotice.getRepetitionCount()+1);
                         myNotice.setTitle(titleStr);
 
                         myNoticeInfo = JSON.toJSONString(myNotice);