bug

huanghongfa

2021-01-20 4e14a51d44aafa21fca28a9b0372a9df2702c927

bug

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,7 +23,10 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -403,7 +406,7 @@
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="38905000" />
      <workItem from="1611019208339" duration="42855000" />
    </task>
    <servers />
  </component>
@@ -443,10 +446,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608878808962" />
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1611121032525">
    <state width="562" height="466" key="DebuggerActiveHint" timestamp="1611129282241">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611121032525" />
    <state width="562" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611129282241" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -455,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="448" key="GridCell.Tab.0.bottom" timestamp="1611126654129">
    <state width="1031" height="448" key="GridCell.Tab.0.bottom" timestamp="1611129339610">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.0.center" timestamp="1611126654128">
    <state width="1031" height="448" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611129339610" />
    <state width="1031" height="448" key="GridCell.Tab.0.center" timestamp="1611129339610">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611126654128" />
    <state width="1031" height="448" key="GridCell.Tab.0.left" timestamp="1611126654128">
    <state width="1031" height="448" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611129339610" />
    <state width="1031" height="448" key="GridCell.Tab.0.left" timestamp="1611129339609">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611126654128" />
    <state width="1031" height="448" key="GridCell.Tab.0.right" timestamp="1611126654129">
    <state width="1031" height="448" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611129339609" />
    <state width="1031" height="448" key="GridCell.Tab.0.right" timestamp="1611129339610">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.1.bottom" timestamp="1611126654129">
    <state width="1031" height="448" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611129339610" />
    <state width="1031" height="448" key="GridCell.Tab.1.bottom" timestamp="1611129339610">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.1.center" timestamp="1611126654129">
    <state width="1031" height="448" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611129339610" />
    <state width="1031" height="448" key="GridCell.Tab.1.center" timestamp="1611129339610">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.1.left" timestamp="1611126654129">
    <state width="1031" height="448" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611129339610" />
    <state width="1031" height="448" key="GridCell.Tab.1.left" timestamp="1611129339610">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.1.right" timestamp="1611126654129">
    <state width="1031" height="448" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611129339610" />
    <state width="1031" height="448" key="GridCell.Tab.1.right" timestamp="1611129339610">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.2.bottom" timestamp="1611126654129">
    <state width="1031" height="448" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611129339610" />
    <state width="1031" height="448" key="GridCell.Tab.2.bottom" timestamp="1611129339610">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.2.center" timestamp="1611126654129">
    <state width="1031" height="448" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611129339610" />
    <state width="1031" height="448" key="GridCell.Tab.2.center" timestamp="1611129339610">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.2.left" timestamp="1611126654129">
    <state width="1031" height="448" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611129339610" />
    <state width="1031" height="448" key="GridCell.Tab.2.left" timestamp="1611129339610">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.2.right" timestamp="1611126654129">
    <state width="1031" height="448" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611129339610" />
    <state width="1031" height="448" key="GridCell.Tab.2.right" timestamp="1611129339610">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611129339610" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -519,14 +522,14 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609398421992" />
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1611044794794">
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1611130640592">
      <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="1611044794794" />
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611126674458">
    <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="1611128613006">
      <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="1611126674458" />
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611128613006" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java

@@ -360,11 +360,11 @@
                sysUserNoticeVO.setUserId(comActEasyPhotoVO1.getSponsorId());
                sysUserNoticeVO.setType(2);
                sysUserNoticeVO.setBusinessType(4);
                sysUserNoticeVO.setBusinessTitle(comActEasyPhotoVO1.getDetail());
                sysUserNoticeVO.setBusinessTime(comActEasyPhotoVO1.getExamineAt());
                sysUserNoticeVO.setBusinessId(id);
                sysUserNoticeVO.setStatus(0);
                if (type.intValue() == 2) {
                    sysUserNoticeVO.setBusinessTitle(comActEasyPhotoVO1.getDetail());
                    sysUserNoticeVO.setTitle("随手拍未通过审核");
                    sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s", comActEasyPhotoVO.getRejectReason()));
                    sysUserNoticeVO.setBusinessStatus(1);
@@ -374,7 +374,8 @@
                    }
                } else if (type.intValue() == 3) {
                    sysUserNoticeVO.setTitle("随手拍有反馈");
                    sysUserNoticeVO.setBusinessContent("社区已经处理好了具体的事宜，将变成现在更好卡的样子找到更好的自己……");
                    sysUserNoticeVO.setBusinessTitle(comActEasyPhotoVO.getHandleResult());
                    sysUserNoticeVO.setBusinessContent("社区已经处理好了具体的事宜，将变成现在更好看的样子找到更好的自己……");
                    sysUserNoticeVO.setBusinessStatus(2);
                    R r2 = userService.addNotice(sysUserNoticeVO);
                    if (R.isOk(r2)) {

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

@@ -132,7 +132,7 @@
            case 4:
                comActMicroWishDO.setDistributionAt(date);
                comActMicroWishDO.setResponsibleId(responsibleId);
                comActMicroWishDO.setStatus(5);//待确认
                comActMicroWishDO.setStatus(3);//待确认
                comActMicroWishDO.setForm(2);
                break;
            case 5:

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -58,10 +58,13 @@
        R r = null;
        try {
            r = comPbMemberService.listSavePartyBuildingMemberExcelVO(list);
        } catch (Exception e) {
        } catch (PartyBuildingMemberException e) {
            return R.fail(e.getMsg());
        }catch (Exception e) {
            e.printStackTrace();
            if (e.getMessage().contains("unique_id_card_community_id")) {
              return R.fail("身份证重复");
            }else {
                return R.fail("身份证重复");
            }else  {
                return R.fail("导入失败");
            }
        }