bug

huanghongfa

2021-01-19 4ec4411ce91552e24589bb2dc0d5d3b1a4b9b5ac

bug

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,23 +24,9 @@
  <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$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.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/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/handel/UserLoginFailureHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/handel/UserLoginFailureHandler.java" 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$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" 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/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.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" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/exceptions/GlobalExceptionCapture.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/exceptions/GlobalExceptionCapture.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" 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" />
@@ -420,7 +406,7 @@
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="19871000" />
      <workItem from="1611019208339" duration="20664000" />
    </task>
    <servers />
  </component>
@@ -472,54 +458,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="483" key="GridCell.Tab.0.bottom" timestamp="1611045671919">
    <state width="1031" height="483" key="GridCell.Tab.0.bottom" timestamp="1611046293936">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611045671919" />
    <state width="1031" height="483" key="GridCell.Tab.0.center" timestamp="1611045671919">
    <state width="1031" height="483" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611046293936" />
    <state width="1031" height="483" key="GridCell.Tab.0.center" timestamp="1611046293936">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611045671919" />
    <state width="1031" height="483" key="GridCell.Tab.0.left" timestamp="1611045671919">
    <state width="1031" height="483" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611046293936" />
    <state width="1031" height="483" key="GridCell.Tab.0.left" timestamp="1611046293936">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611045671919" />
    <state width="1031" height="483" key="GridCell.Tab.0.right" timestamp="1611045671919">
    <state width="1031" height="483" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611046293936" />
    <state width="1031" height="483" key="GridCell.Tab.0.right" timestamp="1611046293936">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611045671919" />
    <state width="1031" height="483" key="GridCell.Tab.1.bottom" timestamp="1611045671919">
    <state width="1031" height="483" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611046293936" />
    <state width="1031" height="483" key="GridCell.Tab.1.bottom" timestamp="1611046293937">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611045671919" />
    <state width="1031" height="483" key="GridCell.Tab.1.center" timestamp="1611045671919">
    <state width="1031" height="483" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611046293937" />
    <state width="1031" height="483" key="GridCell.Tab.1.center" timestamp="1611046293936">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611045671919" />
    <state width="1031" height="483" key="GridCell.Tab.1.left" timestamp="1611045671919">
    <state width="1031" height="483" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611046293936" />
    <state width="1031" height="483" key="GridCell.Tab.1.left" timestamp="1611046293936">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611045671919" />
    <state width="1031" height="483" key="GridCell.Tab.1.right" timestamp="1611045671919">
    <state width="1031" height="483" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611046293936" />
    <state width="1031" height="483" key="GridCell.Tab.1.right" timestamp="1611046293937">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611045671919" />
    <state width="1031" height="483" key="GridCell.Tab.2.bottom" timestamp="1611045671920">
    <state width="1031" height="483" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611046293937" />
    <state width="1031" height="483" key="GridCell.Tab.2.bottom" timestamp="1611046293937">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611045671920" />
    <state width="1031" height="483" key="GridCell.Tab.2.center" timestamp="1611045671920">
    <state width="1031" height="483" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611046293937" />
    <state width="1031" height="483" key="GridCell.Tab.2.center" timestamp="1611046293937">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611045671920" />
    <state width="1031" height="483" key="GridCell.Tab.2.left" timestamp="1611045671920">
    <state width="1031" height="483" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611046293937" />
    <state width="1031" height="483" key="GridCell.Tab.2.left" timestamp="1611046293937">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611045671920" />
    <state width="1031" height="483" key="GridCell.Tab.2.right" timestamp="1611045671920">
    <state width="1031" height="483" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611046293937" />
    <state width="1031" height="483" key="GridCell.Tab.2.right" timestamp="1611046293937">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611045671920" />
    <state width="1031" height="483" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611046293937" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -566,15 +552,6 @@
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1610961524558" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java</url>
          <line>135</line>
          <option name="timeStamp" value="3" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
    <pin-to-top-manager>
      <pinned-members>
        <PinnedItemInfo parentTag="com.panzhihua.common.model.vos.R" memberName="data" />

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java

@@ -35,6 +35,16 @@
    }

    /**
     * 拦截捕捉自定义异常 PartyBuildingMemberException
     * @param ex 党建异常
     * @return 异常信息
     */
    @ExceptionHandler(value = PartyBuildingMemberException.class)
    public R PartyBuildingMemberException(PartyBuildingMemberException ex) {
        return R.fail(ex.getCode(),ex.getMsg());
    }

    /**
     * 拦截捕捉自定义异常 UnAuthenticationException.class
     * @param ex 认证 异常
     * @return R 401

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/exceptions/GlobalExceptionCapture.class

Binary files differ

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

@@ -42,7 +42,7 @@
            "com_mng_volunteer_mng \n" +
            " where state=2 and community_id=#{comMngVolunteerMngVO.communityId}" +
            "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != &quot;&quot;'>" +
            " and name = #{comMngVolunteerMngVO.name} \n" +
            " and name like concat(#{comMngVolunteerMngVO.name},'%')  \n" +
            " </if> " +
            "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != &quot;&quot;'>" +
            "AND phone like concat(#{comMngVolunteerMngVO.phone},'%') " +

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -137,9 +137,9 @@
        } catch (Exception e) {
            e.printStackTrace();
            if (e.getMessage().contains("unique_id_card_community_id")) {
                throw new PartyBuildingMemberException("导入失败，身份证已经存在");
                return R.fail("导入失败，身份证已经存在");
            }
            throw new PartyBuildingMemberException("导入失败，存入数据库错误");
           return R.ok("导入失败");
        }
        return R.ok();
    }