导出

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -8,6 +8,7 @@ import java.util.*;
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.hutool.core.lang.Validator;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.base.bo.UserProfileQueryBo;
 import com.zhongzheng.modules.base.vo.UserProfileExportGaiVo;
@@ -165,15 +166,21 @@ public class ClassGradeController extends BaseController {
     public AjaxResult<UserProfileExportGaiVo> export(ClassGradeUserQueryBo bo) {
 
         String fileName = "";
-        if(bo.getStudyStatus()==0){
+        if(Validator.isEmpty(bo.getStudyStatus())){
+            bo.setStudyStatus(0);
             fileName="全部";
+        }else{
+            if(bo.getStudyStatus()==0){
+                fileName="全部";
+            }
+            if(bo.getStudyStatus()==1){
+                fileName="未完成学习";
+            }
+            if(bo.getStudyStatus()==2){
+                fileName="完成学习";
+            }
         }
-        if(bo.getStudyStatus()==1){
-            fileName="未完成学习";
-        }
-        if(bo.getStudyStatus()==2){
-            fileName="完成学习";
-        }
+
 
         startPage();
         bo.setUserPhoto(1);

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -625,19 +625,19 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
             userProfileExportVo.setApply_post(jsonBean.getApply_post().getValue());
             userProfileExportVo.setMajor(jsonBean.getMajor().getValue());
             userProfileExportVo.setWorking_years(jsonBean.getWorking_years().getValue());
-            if (StringUtils.isNotBlank(jsonBean.getRecent_photos().getValue())) {
+            if (Validator.isNotEmpty(jsonBean.getRecent_photos())) {
                 userProfileExportVo.setRecent_photos(ALIYUN_OSS_ENDPOINT + "/" + jsonBean.getRecent_photos().getValue());
             }
 
-            if (StringUtils.isNotBlank(jsonBean.getIdcard_face_photo().getValue())) {
+            if (Validator.isNotEmpty(jsonBean.getIdcard_face_photo())) {
                 userProfileExportVo.setIdcard_face_photo(ALIYUN_OSS_ENDPOINT + "/" + jsonBean.getIdcard_face_photo().getValue());
             }
 
-            if (StringUtils.isNotBlank(jsonBean.getIdcard_national_photo().getValue())) {
+            if (Validator.isNotEmpty(jsonBean.getIdcard_national_photo())) {
                 userProfileExportVo.setIdcard_national_photo(ALIYUN_OSS_ENDPOINT + "/" + jsonBean.getIdcard_national_photo().getValue());
             }
 
-            if (StringUtils.isNotBlank(jsonBean.getCommitment_electr_signature().getValue())) {
+            if (Validator.isNotEmpty(jsonBean.getCommitment_electr_signature())) {
                 userProfileExportVo.setCommitment_electr_signature(ALIYUN_OSS_ENDPOINT + "/" + jsonBean.getCommitment_electr_signature().getValue());
             }
             //查找盖章得记录