Merge remote-tracking branch 'origin/master'

doum

昨天 2f3221b7c90d5663fdb312653a2d188bc4628370

 server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java

@@ -200,11 +200,11 @@
            Map<String, XSSFPictureData> pics = ie.getExcelPictures();
            if(type == 1) {
              List<CasesImport> importList =  (ie.getDataList(CasesImport.class,null));
              model.setCaseList(isvalidImpartCasesParam(loginUserInfo,pics,importList));
              model.setCaseList(isvalidImpartCasesParam(loginUserInfo,importList));
              model.setTotalNum(model.getCaseList().size());
            }else{
               List<MemberImport> importList = (ie.getDataList(MemberImport.class,null));
               model.setMemberList(isvalidImpartMemberParam(loginUserInfo,categoryList,pics,importList));
               model.setMemberList(isvalidImpartMemberParam(loginUserInfo,categoryList,importList));
               model.setTotalNum(model.getMemberList().size());
            }
            importRecordMapper.insert(model);
@@ -219,12 +219,9 @@
//            redisTemplate.delete(Constants.RedisKeys.IMPORTING_RECORD);
        }
    }
    private  List<Member> isvalidImpartMemberParam(LoginUserInfo user, List<Category> categoryList ,Map<String, XSSFPictureData> pics, List<MemberImport> memberList) {
    private  List<Member> isvalidImpartMemberParam(LoginUserInfo user, List<Category> categoryList , List<MemberImport> memberList) {
        if(memberList ==null || memberList.size()==0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未读取到有效数据");
        }
        if(pics ==null || pics.size()==0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未读取到任何职业照图片数据");
        }
        List<Member> insertMember = new ArrayList<>();
        List<Member> allList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
@@ -358,12 +355,9 @@
         return insertMember;

    }
    private  List<Cases> isvalidImpartCasesParam(LoginUserInfo user,  Map<String, XSSFPictureData> pics, List<CasesImport> casesImportList) {
    private  List<Cases> isvalidImpartCasesParam(LoginUserInfo user,   List<CasesImport> casesImportList) {
        if(casesImportList ==null || casesImportList.size()==0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未读取到有效数据");
        }
        if(pics ==null || pics.size()==0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未读取到任何职业照图片数据");
        }
        List<Cases> insertList = new ArrayList<>();
        List<Member> allList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
@@ -410,7 +404,7 @@
             param.getImageList().addAll(param.getImageList3()!=null?param.getImageList3():new ArrayList<>());
             param.getImageList().addAll(param.getImageList4()!=null?param.getImageList4():new ArrayList<>());
             param.getImageList().addAll(param.getImageList5()!=null?param.getImageList5():new ArrayList<>());
         /*    if(param.getImageList() == null
          /*    if(param.getImageList() == null
                     ||param.getImageList().size() == 0 ){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， 案例图信息不能为空");
             }*/