fix

run-prod.sh

@@ -1,41 +1,4 @@
-#!/usr/bin/env bash
-# 定义应用组名
-group_name='zhongzheng'
-# 定义应用名称
-app_name='zhongzheng-saas-api'
-# 定义应用版本
-app_version='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar----'
-docker stop ${app_name}
-echo '----stop container----'
-docker rm ${app_name}
-echo '----rm container----'
-docker rmi ${group_name}/${app_name}:${app_version}
-echo '----rm image----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
-echo '----build image----'
-docker run -p 5055:5055 --name ${app_name} \
---restart=always \
--e 'spring.profiles.active'=${profile_active} \
--e TZ="Asia/Shanghai" \
--m 10240m \
---cpus=3 \
---log-opt max-size=50m \
---log-opt max-file=3 \
--v /etc/localtime:/etc/localtime \
--v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_api:/logs \
--v /mydata/app/${app_name}/logs:/var/logs \
--d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
 
-echo "开始等待20秒..."
-# 1-10秒内随机
-sleep 5
-echo "等待后继续"
 
 #!/usr/bin/env bash
 # 定义应用组名
@@ -71,46 +34,3 @@ docker run \
 -v /data/nginx/conf.d:/data/nginx/conf.d \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'
-
-echo "开始等待20秒..."
-# 1-10秒内随机
-sleep 5
-echo "等待后继续"
-
-#!/usr/bin/env bash
-# 定义应用组名
-group_admin_name='zhongzheng'
-# 定义应用名称
-app_admin_name='zhongzheng-saas-admin-top'
-# 定义应用版本
-app_admin_version='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar admin top----'
-docker stop ${app_admin_name}
-echo '----stop container admin top----'
-docker rm ${app_admin_name}
-echo '----rm container admin top----'
-docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----rm image admin top----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile-saas -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
-echo '----build image admin top----'
-docker run \
--p 7077:7077 \
---name ${app_admin_name} \
---restart=always \
---log-opt max-size=50m \
---log-opt max-file=3 \
--e 'spring.profiles.active'=${profile_active} \
--e TZ="Asia/Shanghai" \
--v /etc/localtime:/etc/localtime \
--v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_admin_top:/logs \
--v /mydata/app/${app_admin_name}/logs:/var/logs \
--v /data/nginx/conf.d:/data/nginx/conf.d \
--d ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----start container admin top----'
-
-
-

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

@@ -903,15 +903,15 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
                 userProfileExportVo.setSex(jsonBean.getSex().getValue());
                 userProfileExportVo.setIdcard(jsonBean.getIdcard().getValue());
                 userProfileExportVo.setTelphone(jsonBean.getTelphone().getValue());
-                userProfileExportVo.setEducation(jsonBean.getEducation().getValue());
-                userProfileExportVo.setSchool(jsonBean.getSchool().getValue());
-                userProfileExportVo.setGraduation_time(DateUtil.formatDate(jsonBean.getGraduation_time().getValue()));
-                userProfileExportVo.setWork_unit(jsonBean.getWork_unit().getValue());
-                userProfileExportVo.setUnit_contact(jsonBean.getUnit_contact().getValue());
-                userProfileExportVo.setUnit_tel(jsonBean.getUnit_tel().getValue());
-                userProfileExportVo.setApply_post(jsonBean.getApply_post().getValue());
-                userProfileExportVo.setMajor(jsonBean.getMajor().getValue());
-                userProfileExportVo.setWorking_years(jsonBean.getWorking_years().getValue());
+                userProfileExportVo.setEducation(Validator.isEmpty(jsonBean.getEducation())?"":jsonBean.getEducation().getValue());
+                userProfileExportVo.setSchool(Validator.isEmpty(jsonBean.getSchool())?"":jsonBean.getSchool().getValue());
+                userProfileExportVo.setGraduation_time(Validator.isEmpty(jsonBean.getGraduation_time())?"":DateUtil.formatDate(jsonBean.getGraduation_time().getValue()));
+                userProfileExportVo.setWork_unit(Validator.isEmpty(jsonBean.getWork_unit())?"":jsonBean.getWork_unit().getValue());
+                userProfileExportVo.setUnit_contact(Validator.isEmpty(jsonBean.getUnit_contact())?"":jsonBean.getUnit_contact().getValue());
+                userProfileExportVo.setUnit_tel(Validator.isEmpty(jsonBean.getUnit_tel())?"":jsonBean.getUnit_tel().getValue());
+                userProfileExportVo.setApply_post(Validator.isEmpty(jsonBean.getApply_post())?"":jsonBean.getApply_post().getValue());
+                userProfileExportVo.setMajor(Validator.isEmpty(jsonBean.getMajor())?"":jsonBean.getMajor().getValue());
+                userProfileExportVo.setWorking_years(Validator.isEmpty(jsonBean.getWorking_years())?"":jsonBean.getWorking_years().getValue());
                 List<String> fileList = new ArrayList<>();
                 if (Validator.isNotEmpty(jsonBean.getRecent_photos().getValue())) {
                     userProfileExportVo.setRecent_photos(ALIYUN_OSS_ENDPOINT + "/" + jsonBean.getRecent_photos().getValue());