FIX 合并

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

@@ -553,7 +553,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             g.drawString(entity.getDateD(), 1071, 677);
 
             //二维码
-            String qrTxt = CERTIFICATE_HOST+"certificate.html?code="+entity.getCode();
+            String qrTxt = CERTIFICATE_HOST+"pages/certificate/index?code="+entity.getCode();
             QRCodeWriter qrCodeWriter = new QRCodeWriter();
             BitMatrix bitMatrix = qrCodeWriter.encode(qrTxt, BarcodeFormat.QR_CODE, 120, 120);
             BufferedImage qrImage = toBufferedImage(bitMatrix);

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

@@ -717,19 +717,16 @@ 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());
                 }
             }

zhongzheng-system/src/main/resources/mapper/modules/base/UserProfileMapper.xml

@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN goods g ON  up.goods_id = g.goods_id LEFT JOIN course_business cb on g.business_id = cb.id
         where 1=1
         and up.current_status = 1
+        and up.status != -1
         <if test="status != null and status.size()!=0 ">
             AND up.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">