Merge remote-tracking branch 'origin/master'

src/main/java/io/office/modules/manage/service/impl/LogisticsServiceImpl.java

@@ -21,10 +21,10 @@ public class LogisticsServiceImpl extends ServiceImpl<LogisticsDao, LogisticsEnt
     public PageUtils queryPage(Map<String, Object> params) {
         QueryWrapper<LogisticsEntity> logisticsEntityQueryWrapper = new QueryWrapper<>();
         if(!StringUtils.isNullOrEmpty(String.valueOf(params.get("title")))){
-            logisticsEntityQueryWrapper.eq("title",params.get("title"));
+            logisticsEntityQueryWrapper.like("title",params.get("title"));
         }
         if(!StringUtils.isNullOrEmpty(String.valueOf(params.get("keyword")))){
-            logisticsEntityQueryWrapper.eq("keyword",params.get("keyword"));
+            logisticsEntityQueryWrapper.like("keyword",params.get("keyword"));
         }
         if(!StringUtils.isNullOrEmpty(String.valueOf(params.get("type")))){
             logisticsEntityQueryWrapper.eq("type",params.get("type"));

src/main/java/io/office/modules/manage/service/impl/MedicalServiceImpl.java

@@ -27,7 +27,7 @@ public class MedicalServiceImpl extends ServiceImpl<MedicalDao, MedicalEntity> i
     public PageUtils queryPage(Map<String, Object> params) {
         QueryWrapper<MedicalEntity> medicalEntityQueryWrapper = new QueryWrapper<>();
         if(!StringUtil.isNullOrEmpty(String.valueOf(params.get("title")))){
-            medicalEntityQueryWrapper.eq("title",params.get("title"));
+            medicalEntityQueryWrapper.like("title",params.get("title"));
         }
         if(!StringUtil.isNullOrEmpty(String.valueOf(params.get("type")))){
             medicalEntityQueryWrapper.eq("type",params.get("type"));

src/main/java/io/office/modules/manage/service/impl/NewsServiceImpl.java

@@ -73,6 +73,9 @@ public class NewsServiceImpl extends ServiceImpl<NewsDao, NewsEntity> implements
         newsEntityQueryWrapper.eq("id", news.getId());
         news.setEditor(user.getUsername());
         news.setLasteditor(user.getUsername());
+        if (news.getCclassid() != null) {
+            news.setClassid(news.getCclassid());
+        }
         int update = baseMapper.update(news, newsEntityQueryWrapper);
         if (update > 0) {
             return R.ok("修改成功!");

src/main/resources/mapper/manage/TopicnewsDao.xml

@@ -56,11 +56,11 @@
             and b.auditor =#{newsParams.auditor}
         </if>
         <choose>
-            <when test="newsParams.levels != 0">
+            <when test="newsParams.levels !=null">
                 AND b.levels = #{newsParams.levels}
             </when>
             <otherwise>
-                AND b.levels = 0
+                AND b.levels > 0
             </otherwise>
         </choose>
         ORDER BY