评论

huanghongfa

2021-01-24 784ac5ca68e1a96a23119d8d48870cbd0ffce84a

评论

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,19 +23,8 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussCommentUserDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussCommentDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussCommentDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -418,7 +407,7 @@
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="94460000" />
      <workItem from="1611365644515" duration="32363000" />
      <workItem from="1611365644515" duration="33195000" />
    </task>
    <servers />
  </component>
@@ -474,54 +463,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
    <state width="1031" height="477" key="GridCell.Tab.0.bottom" timestamp="1611465837493">
    <state width="1031" height="477" key="GridCell.Tab.0.bottom" timestamp="1611465904920">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611465837493" />
    <state width="1031" height="477" key="GridCell.Tab.0.center" timestamp="1611465837493">
    <state width="1031" height="477" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.0.center" timestamp="1611465904920">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611465837493" />
    <state width="1031" height="477" key="GridCell.Tab.0.left" timestamp="1611465837492">
    <state width="1031" height="477" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.0.left" timestamp="1611465904920">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611465837492" />
    <state width="1031" height="477" key="GridCell.Tab.0.right" timestamp="1611465837493">
    <state width="1031" height="477" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.0.right" timestamp="1611465904920">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611465837493" />
    <state width="1031" height="477" key="GridCell.Tab.1.bottom" timestamp="1611465837493">
    <state width="1031" height="477" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.1.bottom" timestamp="1611465904920">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611465837493" />
    <state width="1031" height="477" key="GridCell.Tab.1.center" timestamp="1611465837493">
    <state width="1031" height="477" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.1.center" timestamp="1611465904920">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611465837493" />
    <state width="1031" height="477" key="GridCell.Tab.1.left" timestamp="1611465837493">
    <state width="1031" height="477" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.1.left" timestamp="1611465904920">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611465837493" />
    <state width="1031" height="477" key="GridCell.Tab.1.right" timestamp="1611465837493">
    <state width="1031" height="477" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.1.right" timestamp="1611465904920">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611465837493" />
    <state width="1031" height="477" key="GridCell.Tab.2.bottom" timestamp="1611465837493">
    <state width="1031" height="477" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.2.bottom" timestamp="1611465904920">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611465837493" />
    <state width="1031" height="477" key="GridCell.Tab.2.center" timestamp="1611465837493">
    <state width="1031" height="477" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.2.center" timestamp="1611465904920">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611465837493" />
    <state width="1031" height="477" key="GridCell.Tab.2.left" timestamp="1611465837493">
    <state width="1031" height="477" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.2.left" timestamp="1611465904920">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611465837493" />
    <state width="1031" height="477" key="GridCell.Tab.2.right" timestamp="1611465837493">
    <state width="1031" height="477" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.2.right" timestamp="1611465904920">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611465837493" />
    <state width="1031" height="477" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611465904920" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -534,10 +523,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="270" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1606120706449" />
    <state width="498" height="540" key="SwitcherDM" timestamp="1611461451075">
    <state width="498" height="540" key="SwitcherDM" timestamp="1611471781727">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1611461451075" />
    <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1611471781727" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1609398421992">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java

@@ -155,12 +155,11 @@
            "AND u.phone LIKE concat( #{pageComActDiscussCommentDTO.account}, '%' )\n" +
            " </if> " +
            "LEFT JOIN com_act_discuss_comment_user cu ON c.id = cu.disscuss_comment_id \n" +
            " <where>" +
            " where c.discuss_id=#{pageComActDiscussCommentDTO.id}" +
            "<if test='pageComActDiscussCommentDTO.comment != null and pageComActDiscussCommentDTO.comment.trim() != &quot;&quot;'>" +
            "c.`comment` LIKE concat( '%', #{pageComActDiscussCommentDTO.comment" +
            " and c.`comment` LIKE concat( '%', #{pageComActDiscussCommentDTO.comment" +
            "}, '%' ) \n" +
            " </if> " +
            " </where>" +
            "GROUP BY\n" +
            "c.id\n" +
            ")t order by t.is_topping desc , t.create_at desc"+