Merge branch 'master' of http://47.100.37.243:10080/wutt/lsappBms

pcbms/src/main/java/com/hssx/pcbms/service/impl/IdeaCommentServiceImpl.java

@@ -66,6 +66,7 @@ public class IdeaCommentServiceImpl extends ServiceImpl<IdeaCommentMapper, IdeaC
         if (oldIdeaComment != null) {
             Idea idea = ideaMapper.selectOne(new QueryWrapper<Idea>().eq("id", oldIdeaComment.getIdeaId()));
             idea.setScore(0.0);
+            idea.setIsEvaluated(0);
             ideaMapper.updateById(idea);
             ideaCommentMapper.deleteById(ideaComment.getId());
         }else{

pcbms/src/main/resources/mapper/IdeaMapper.xml

@@ -58,7 +58,7 @@
                 and score_id = #{idea.scoreId}
             </if>
         </where>
-        order by i.indate,i.id desc
+        order by i.is_evaluated asc,i.indate,i.id desc
     </select>
     <select id="getIdeaScoreLists" resultMap="BaseResultMap">
         select