新增社区

huanghongfa

2021-01-25 266299dbef85fc0a7afcce72c52a8c893c59980d

新增社区

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,7 +24,15 @@
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <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" />
      <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" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -177,15 +185,13 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
      <option name="arquillianRunConfiguration">
        <value>
          <option name="containerStateName" value="" />
        </value>
      </option>
      <option name="TEST_OBJECT" value="CLASS" />
      <properties />
      <listeners />
      <option name="TEST_OBJECT" value="class" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
@@ -408,6 +414,7 @@
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="94460000" />
      <workItem from="1611365644515" duration="33195000" />
      <workItem from="1611536010905" duration="929000" />
    </task>
    <servers />
  </component>
@@ -463,54 +470,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="1611465904920">
    <state width="1031" height="477" key="GridCell.Tab.0.bottom" timestamp="1611536415557">
      <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="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.0.center" timestamp="1611465904920">
    <state width="1031" height="477" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611536415557" />
    <state width="1031" height="477" key="GridCell.Tab.0.center" timestamp="1611536415556">
      <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="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.0.left" timestamp="1611465904920">
    <state width="1031" height="477" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611536415556" />
    <state width="1031" height="477" key="GridCell.Tab.0.left" timestamp="1611536415556">
      <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="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.0.right" timestamp="1611465904920">
    <state width="1031" height="477" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611536415556" />
    <state width="1031" height="477" key="GridCell.Tab.0.right" timestamp="1611536415557">
      <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="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.1.bottom" timestamp="1611465904920">
    <state width="1031" height="477" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611536415557" />
    <state width="1031" height="477" key="GridCell.Tab.1.bottom" timestamp="1611536415227">
      <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="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.1.center" timestamp="1611465904920">
    <state width="1031" height="477" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611536415227" />
    <state width="1031" height="477" key="GridCell.Tab.1.center" timestamp="1611536415227">
      <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="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.1.left" timestamp="1611465904920">
    <state width="1031" height="477" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611536415227" />
    <state width="1031" height="477" key="GridCell.Tab.1.left" timestamp="1611536415227">
      <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="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.1.right" timestamp="1611465904920">
    <state width="1031" height="477" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611536415227" />
    <state width="1031" height="477" key="GridCell.Tab.1.right" timestamp="1611536415227">
      <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="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.2.bottom" timestamp="1611465904920">
    <state width="1031" height="477" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611536415227" />
    <state width="1031" height="477" key="GridCell.Tab.2.bottom" timestamp="1611536415228">
      <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="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.2.center" timestamp="1611465904920">
    <state width="1031" height="477" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611536415228" />
    <state width="1031" height="477" key="GridCell.Tab.2.center" timestamp="1611536415228">
      <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="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.2.left" timestamp="1611465904920">
    <state width="1031" height="477" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611536415228" />
    <state width="1031" height="477" key="GridCell.Tab.2.left" timestamp="1611536415227">
      <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="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.2.right" timestamp="1611465904920">
    <state width="1031" height="477" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611536415227" />
    <state width="1031" height="477" key="GridCell.Tab.2.right" timestamp="1611536415228">
      <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="1611465904920" />
    <state width="1031" height="477" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611536415228" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -535,10 +542,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611130640592" />
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611451904838">
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611536956966">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611451904838" />
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611536956966" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -737,7 +737,7 @@
        Integer isAll = menuRoleVO.getIsAll();
        Long communityId = menuRoleVO.getCommunityId();
        if (isAll.intValue()==1) {
            List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 1l).eq(SysMenuDO::getParentId,0).orderByAsc(SysMenuDO::getOrderNum));
            List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 2l).eq(SysMenuDO::getParentId,0).orderByAsc(SysMenuDO::getOrderNum));
            Long menuIdParent = sysMenuDOS.get(1).getMenuId();
            List<SysMenuDO> sysMenuDOSErJi = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId, menuIdParent));
            if (!ObjectUtils.isEmpty(sysMenuDOS)) {