代码修改

business/base-service/src/main/java/com/yihu/jw/article/service/BaseMenuManageService.java

@@ -21,10 +21,8 @@ import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -746,7 +744,6 @@ public class BaseMenuManageService {
    }
    public MixEnvelop findArticleByMenuId(String menuId,String title,Integer page,Integer pageSize,String isContent){
        Pageable pageRequest = PageRequest.of(page-1,pageSize);
        List<String> menuIds = new ArrayList<>();
        if (StringUtils.isNoneBlank(menuId)){
            String str[]= menuId.split(",");
@@ -760,18 +757,57 @@ public class BaseMenuManageService {
        List<KnowledgeArticleDictDO> list;
        if(StringUtils.isNotBlank(title)){
            count = knowledgeArticleDictDao.getCountByCategorySecond(menuIds,title);
            list=knowledgeArticleDictDao.findByCategorySecondAndPage(menuIds,title,pageRequest);
        }else {
            count = knowledgeArticleDictDao.getCountByCategorySecond(menuIds);
            list=knowledgeArticleDictDao.findByCategorySecondAndPage(menuIds,pageRequest);
        }
        List<KnowledgeArticleDictDO> listnew = new ArrayList<>();
        BeanUtils.copyProperties(listnew,list);
        String sqlTmp = " content,";
        if(!"1".equals(isContent)){
            for (KnowledgeArticleDictDO dictDO:list){
                dictDO.setContent(null);
            }
            sqlTmp =  "  null  content ," ;
        }
        String sql = "select id   ,\n" +
                "  title   ,\n" +
                "  subtitle   ,\n" +
                "  intro   ,\n" +
                "  type,\n" +
                "  category_first   ,\n" +
                "  category_first_name   ,\n" +
                "  category_second   ,\n" +
                "  category_second_name   ,\n" +
                sqlTmp +
                "  image   ,\n" +
                "  img   ,\n" +
                "  url,\n" +
                "  vedio_url   ,\n" +
                "  create_user   ,\n" +
                "  create_time,\n" +
                "  update_time,\n" +
                "  del,\n" +
                "  status,\n" +
                "  used,\n" +
                "  source   ,\n" +
                "  cancel_reason   ,\n" +
                "  read_count,\n" +
                "  collection,\n" +
                "  fabulous,\n" +
                "  comment,\n" +
                "  is_share,\n" +
                "  create_user_name   ,\n" +
                "  create_user_dept   ,\n" +
                "  create_user_dept_name   ,\n" +
                "  check_time,\n" +
                "  release_status,\n" +
                "  release_time,\n" +
                "  puplish_type,\n" +
                "  recommend_doctor,\n" +
                "  puplish_type_name,\n" +
                "  recommend_doctor_name from wlyy_knowledge_article_dict a where a.del=1 and " +
                " a.category_second IN ( '"+menuId.replaceAll(",","'")+"' ) and a.release_status=1  ";
        if(StringUtils.isNotBlank(title)){
            sql += " and a.title like %"+title+"%";
        }
        sql += "  order by  a.release_time desc,a.create_time desc limit "+(page-1)*pageSize+","+pageSize;
        list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(KnowledgeArticleDictDO.class));
        MixEnvelop mixEnvelop = new MixEnvelop();
        mixEnvelop.setTotalCount(count);