bug

huanghongfa

2021-01-19 5f800e667f66b912b1ae984269a0d4c3c0258fa9

bug

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,7 +24,23 @@
  <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/ComMngVolunteerMngDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java" 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$/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" />
@@ -404,7 +420,7 @@
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="15275000" />
      <workItem from="1611019208339" duration="19871000" />
    </task>
    <servers />
  </component>
@@ -444,10 +460,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="1611021304034">
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1611045182355">
      <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="1611021304034" />
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611045182355" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -456,54 +472,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="416" key="GridCell.Tab.0.bottom" timestamp="1611039695338">
    <state width="1031" height="483" key="GridCell.Tab.0.bottom" timestamp="1611045671919">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.0.center" timestamp="1611039695338">
    <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">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.0.left" timestamp="1611039695338">
    <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">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.0.right" timestamp="1611039695338">
    <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">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.1.bottom" timestamp="1611039695339">
    <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">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611039695339" />
    <state width="1031" height="416" key="GridCell.Tab.1.center" timestamp="1611039695338">
    <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">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.1.left" timestamp="1611039695338">
    <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">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.1.right" timestamp="1611039695338">
    <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">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.2.bottom" timestamp="1611039695339">
    <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">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611039695339" />
    <state width="1031" height="416" key="GridCell.Tab.2.center" timestamp="1611039695339">
    <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">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611039695339" />
    <state width="1031" height="416" key="GridCell.Tab.2.left" timestamp="1611039695339">
    <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">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611039695339" />
    <state width="1031" height="416" key="GridCell.Tab.2.right" timestamp="1611039695339">
    <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">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611039695339" />
    <state width="1031" height="483" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611045671920" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -520,14 +536,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="1611023689827">
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1611044794794">
      <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="1611023689827" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1611040842504">
    <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="468" y="42" width="766" height="782" key="find.popup" timestamp="1611045692188">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611040842504" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611045692188" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -550,6 +566,15 @@
    <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/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java

@@ -122,6 +122,7 @@
    @PostMapping("volunteer")
    public R addVolunteer(@RequestBody @Validated(AddGroup.class) ComMngVolunteerMngVO comMngVolunteerMngVO){
        comMngVolunteerMngVO.setState(1);
        comMngVolunteerMngVO.setCommunityId(this.getCommunityId());
        return communityService.addVolunteer(comMngVolunteerMngVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java

@@ -40,7 +40,7 @@
        // 查询用户是否存在
        R<LoginUserInfoVO> r = userService.getUserInfo(userName);
        if (r.getCode()!=200) {
            throw new UsernameNotFoundException("用户名不存在");
            throw new UsernameNotFoundException("该账号不存在");
        }
        LoginUserInfoVO loginUserInfoVO = r.getData();
        List<GrantedAuthority> grantedAuthorityList=new ArrayList<>();
@@ -51,7 +51,7 @@
            });
        }
        if (ObjectUtils.isEmpty(loginUserInfoVO.getAccount())) {
            throw new UsernameNotFoundException("用户名不存在");
            throw new UsernameNotFoundException("该账号不存在");
        }
        // 我们还要判断密码是否正确，这里我们的密码使用BCryptPasswordEncoder进行加密的
        if (!new BCryptPasswordEncoder().matches(password, loginUserInfoVO.getPassword())) {

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLoginFailureHandler.java

@@ -31,7 +31,7 @@
        log.info("登录失败");
        // 这些对于操作的处理类可以根据不同异常进行不同处理
        if (exception instanceof UsernameNotFoundException){
            ResultUtil.responseJson(response, R.fail("用户名不存在"));
            ResultUtil.responseJson(response, R.fail("该账号不存在"));
        }
        if (exception instanceof LockedException){
            ResultUtil.responseJson(response,R.fail("用户被冻结"));

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java

@@ -17,4 +17,6 @@
    private Long id;
    @ApiModelProperty(value = "党组织名字")
    private String name;
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.class

Binary files differ

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

@@ -57,10 +57,9 @@
    private PartyBuildingService partyBuildingService;
    @Resource
    private UserService userService;
    /**
     * 导入模板名字
     */
    private final String UPLOAD_EXCEL = "社区党员数据导入模板.xlsx";

    private String UPLOAD_EXCEL_URL="http://panzhihua.nhys.cdnhxx.com/web/%E7%A4%BE%E5%8C%BA%E5%85%9A%E5%91%98%E6%95%B0%E6%8D%AE%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx";


    @ApiOperation(value = "社区所有党组织", response = PartyOrganizationVO.class)
    @GetMapping("listpartyorganization")
@@ -95,44 +94,9 @@
    }

    @ApiOperation(value = "下载模板-导入党员")
    @GetMapping(value = "downloadtemplate", headers = "Accept=application/octet-stream")
    public void downloadTemplate(HttpServletResponse response) throws IOException, SftpException {
        SFTPUtil sftp = new SFTPUtil();
        sftp.login();
        InputStream inputStream = sftp.downloadInputStream(FtpConstants.FTPFILEPATH_MUBAN, UPLOAD_EXCEL);
        // 配置文件下载
        response.setHeader("content-type", "application/octet-stream");
        response.setContentType("application/octet-stream");
        // 下载文件能正常显示中文
        response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(UPLOAD_EXCEL, "UTF-8"));
        response.setCharacterEncoding("UTF-8");
        byte[] fileData = IOUtils.toByteArray(inputStream);


        String result ="";
        for(byte b:fileData ){
            result += getBinaryStrFromByte(b);
        }
        System.out.println(result);

        // 实现文件下载
        byte[] buffer = new byte[1024];
        BufferedInputStream bis = null;
        try {
            bis = new BufferedInputStream(inputStream);
            OutputStream os = response.getOutputStream();
            int i = bis.read(buffer);
            while (i != -1) {
                os.write(buffer, 0, i);
                i = bis.read(buffer);
            }
        } catch (Exception exception) {
            log.error("下载出错");
        } finally {
            if (null != bis) {
                bis.close();
            }
        }
    @GetMapping(value = "downloadtemplate")
    public R downloadTemplate(HttpServletResponse response) throws IOException, SftpException {
        return R.ok(UPLOAD_EXCEL_URL);
    }

    @ApiOperation(value = "上传照片")
@@ -160,7 +124,7 @@
        log.info("传入文件名字【{}】",fileName);
        InputStream inputStream = null;
        try {
            inputStream = file.getInputStream();//todo 导入要看数据库有无重复数据 加入社区字段 身份证字段导入重复判断
            inputStream = file.getInputStream();
            EasyExcel.read(inputStream, PartyBuildingMemberExcelVO.class, new PartyBuildingMemberExcelListen(partyBuildingService)).sheet().doRead();
        } catch (IOException e) {
            e.printStackTrace();

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

@@ -18,6 +18,7 @@
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;

/**
@@ -39,9 +40,9 @@
    @Override
    public R addVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
        String phone = comMngVolunteerMngVO.getPhone();
        Integer integer = comMngVolunteerMngDAO.selectCount(new QueryWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getPhone, phone));
        Integer integer = comMngVolunteerMngDAO.selectCount(new QueryWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getPhone, phone).in(ComMngVolunteerMngDO::getState, Arrays.asList(new Integer[]{1,2})));
        if (null!=integer&&integer.intValue()>0) {
            return R.fail("手机号已经存在");
            return R.fail("请勿重复申请");
        }
        ComMngVolunteerMngDO comMngVolunteerMngDO=new ComMngVolunteerMngDO();
        BeanUtils.copyProperties(comMngVolunteerMngVO,comMngVolunteerMngDO);

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

@@ -101,6 +101,7 @@
                    PartyOrganizationVO partyOrganizationVO=new PartyOrganizationVO();
                    partyOrganizationVO.setId(comPbOrgDO.getId());
                    partyOrganizationVO.setName(comPbOrgDO.getName());
                    partyOrganizationVO.setCommunityId(comPbOrgDO.getCommunityId());
                    partyOrganizationVOList.add(partyOrganizationVO);
                });
                partyOrganizationVOS= partyOrganizationVOList;
@@ -120,7 +121,9 @@
                if (ObjectUtils.isEmpty(collect)) {
                    throw new PartyBuildingMemberException("导入失败，组织不存在"+partyBuildingMemberExcelVO.getOrgName());
                }else{
                    comPbMemberDO.setOrgId(collect.get(0).getId());
                    PartyOrganizationVO partyOrganizationVO = collect.get(0);
                    comPbMemberDO.setOrgId(partyOrganizationVO.getId());
                    comPbMemberDO.setCommunityId(partyOrganizationVO.getCommunityId());
                }
                comPbMemberDO.setEmploymentTime(partyBuildingMemberExcelVO.getEmploymentTime());
                comPbMemberDO.setJoinTime(partyBuildingMemberExcelVO.getJoinTime());
@@ -132,6 +135,7 @@
        try {
            this.saveBatch(comPbMemberDOS);
        } catch (Exception e) {
            e.printStackTrace();
            if (e.getMessage().contains("unique_id_card_community_id")) {
                throw new PartyBuildingMemberException("导入失败，身份证已经存在");
            }

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -107,8 +107,10 @@
            "u.user_id,\n" +
            "u.account,\n" +
            "u.`name`,\n" +
            "u.`password`,\n" +
            "u.phone,\n" +
            "e.role_name,\n" +
            "e.role_id ,\n" +
            "u.`status`,\n" +
            "u.create_at,\n" +
            "u.last_login_time \n" +
@@ -124,13 +126,13 @@
            "AND u.community_id = #{administratorsUserVO.communityId} \n" +
            " </if> " +
            "<if test='administratorsUserVO.name != null and administratorsUserVO.name.trim() != &quot;&quot;'>" +
            "AND u.name = #{administratorsUserVO.name} \n" +
            "AND u.name like concat (#{administratorsUserVO.name},'%')  \n" +
            " </if> " +
            "<if test='administratorsUserVO.phone != null and administratorsUserVO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone = #{administratorsUserVO.phone}" +
            "AND u.phone like concat(#{administratorsUserVO.phone},'%') " +
            " </if> " +
            "<if test='administratorsUserVO.account != null and administratorsUserVO.account.trim() != &quot;&quot;'>" +
            "AND u.account = #{administratorsUserVO.account}" +
            "AND u.account like concat(#{administratorsUserVO.account},'%') " +
            " </if> " +
            " </where>" +
            "</script>")