submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/DangAnController.java

@@ -1,9 +1,12 @@
 package com.zhongzheng.controller.user;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.EasyPoiUtil;
@@ -173,6 +176,9 @@ public class DangAnController extends BaseController {
     @PostMapping("/userDataImportUp")
     public AjaxResult userDataImportUp(MultipartFile file) {
         List<UserDataImportBo> customerBos = EasyPoiUtil.importExcel(file,0,1,UserDataImportBo.class);
+        if (CollectionUtils.isEmpty(customerBos) || customerBos.stream().allMatch(x -> ObjectUtils.isNull(x.getUserCard()))){
+            throw new CustomException("导入文件格式不正确或文件为空，请检查文件!");
+        }
         iUserService.userDataImportUp(customerBos);
         return AjaxResult.success();
     }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1825,7 +1825,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                     throw new CustomException(name+"上传oss失败");
                 }
                 if (name.toString().contains("证件照")){
-                    user.setAvatar(upload);
+                    user.setOneInchPhotos(upload);
                 }
                 if (name.toString().contains("身份证正面")){
                     user.setIdCardImg1(upload);

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -681,12 +681,12 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         queryBo.setId(goodsVo.getBusinessId());
         String fullName = iCourseBusinessService.queryFullName(queryBo);
         if(goodsVo.getBusinessId().longValue()!=business.getId().longValue()){
-//            CourseBusiness business7 = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getId,goodsVo.getBusinessId()).last("limit 1"));
-//            if(Validator.isEmpty(business7)||(Validator.isNotEmpty(business7)&&!"七大员".equals(business7.getBusinessName()))){
-//                if(!"继续教育二级造价师".equals(fullName)){
-//                    return true;
-//                }
-//            }
+            CourseBusiness business7 = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getId,goodsVo.getBusinessId()).last("limit 1"));
+            if(Validator.isEmpty(business7)||(Validator.isNotEmpty(business7)&&!"七大员".equals(business7.getBusinessName()))){
+                if(!"继续教育二级造价师".equals(fullName)){
+                    return true;
+                }
+            }
 //            if(Validator.isNotEmpty(business7)&&"七大员".equals(business7.getBusinessName())){
 //                hasSeven = true;
 //                studyRec.setCourseType(17);