一起议

huanghongfa

2021-01-24 3fbdc03b6eba4047ca38a14e2b83a0a915159006

一起议

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,15 +23,8 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" 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" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -414,7 +407,7 @@
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="94460000" />
      <workItem from="1611365644515" duration="25986000" />
      <workItem from="1611365644515" duration="27577000" />
    </task>
    <servers />
  </component>
@@ -470,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="1611451193278">
    <state width="1031" height="477" key="GridCell.Tab.0.bottom" timestamp="1611460936374">
      <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="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.0.center" timestamp="1611451193277">
    <state width="1031" height="477" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611460936374" />
    <state width="1031" height="477" key="GridCell.Tab.0.center" timestamp="1611460936374">
      <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="1611451193277" />
    <state width="1031" height="477" key="GridCell.Tab.0.left" timestamp="1611451193277">
    <state width="1031" height="477" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611460936374" />
    <state width="1031" height="477" key="GridCell.Tab.0.left" timestamp="1611460936374">
      <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="1611451193277" />
    <state width="1031" height="477" key="GridCell.Tab.0.right" timestamp="1611451193278">
    <state width="1031" height="477" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611460936374" />
    <state width="1031" height="477" key="GridCell.Tab.0.right" timestamp="1611460936374">
      <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="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.1.bottom" timestamp="1611451193278">
    <state width="1031" height="477" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611460936374" />
    <state width="1031" height="477" key="GridCell.Tab.1.bottom" timestamp="1611460936375">
      <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="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.1.center" timestamp="1611451193278">
    <state width="1031" height="477" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611460936375" />
    <state width="1031" height="477" key="GridCell.Tab.1.center" timestamp="1611460936374">
      <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="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.1.left" timestamp="1611451193278">
    <state width="1031" height="477" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611460936374" />
    <state width="1031" height="477" key="GridCell.Tab.1.left" timestamp="1611460936374">
      <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="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.1.right" timestamp="1611451193278">
    <state width="1031" height="477" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611460936374" />
    <state width="1031" height="477" key="GridCell.Tab.1.right" timestamp="1611460936374">
      <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="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.2.bottom" timestamp="1611451193278">
    <state width="1031" height="477" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611460936374" />
    <state width="1031" height="477" key="GridCell.Tab.2.bottom" timestamp="1611460936375">
      <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="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.2.center" timestamp="1611451193278">
    <state width="1031" height="477" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611460936375" />
    <state width="1031" height="477" key="GridCell.Tab.2.center" timestamp="1611460936375">
      <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="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.2.left" timestamp="1611451193278">
    <state width="1031" height="477" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611460936375" />
    <state width="1031" height="477" key="GridCell.Tab.2.left" timestamp="1611460936375">
      <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="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.2.right" timestamp="1611451193278">
    <state width="1031" height="477" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611460936375" />
    <state width="1031" height="477" key="GridCell.Tab.2.right" timestamp="1611460936375">
      <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="1611451193278" />
    <state width="1031" height="477" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611460936375" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -530,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="1611391726458">
    <state width="498" height="540" key="SwitcherDM" timestamp="1611460791717">
      <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="1611391726458" />
    <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1611460791717" />
    <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

@@ -32,7 +32,7 @@
//            " </if> " +
//            " </where>" +
//            "</script>")
    @Select("select type,name,phone from sys_user where user_id=#{userId}")
    @Select("select type,name,phone,image_url from sys_user where user_id=#{userId}")
    LoginUserInfoVO selectUserByUserId(Long userId);
    @Select("<script> " +
            "select t.* from ("+
@@ -80,12 +80,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.create_at desc"+

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java

@@ -451,6 +451,7 @@
        Long userId = comActDiscussDO.getUserId();
        LoginUserInfoVO loginUserInfoVO=comActDiscussDAO.selectUserByUserId(userId);
        comActDiscussVO.setUserName(loginUserInfoVO.getName());
        comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());
        Long communityId = comActDiscussDO.getCommunityId();
        Integer type1 = loginUserInfoVO.getType();
        if (type1.intValue()>1) {