yangdamao 1 ano atrás
pai
commit
a12d6d6636

+ 10 - 0
zhongzheng-common/src/main/java/com/zhongzheng/common/type/EncryptHandler.java

@@ -63,6 +63,16 @@ public class EncryptHandler  implements TypeHandler<String> {
         return SecureUtil.aes(KEYS).decryptStr(value);
         return SecureUtil.aes(KEYS).decryptStr(value);
     }
     }
 
 
+    public static String decryptTwo(String value) {
+        if (null == value) {
+            return null;
+        }
+        if (value.length()<=20 ) {
+            return value;
+        }
+        return SecureUtil.aes(KEYS).decryptStr(value);
+    }
+
     public static String encrypt(String value){
     public static String encrypt(String value){
         if (null == value) {
         if (null == value) {
             return null;
             return null;

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

@@ -731,7 +731,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         studyRec.setMajorName(goodsVo.getSubjectNames());
         studyRec.setMajorName(goodsVo.getSubjectNames());
         studyRec.setName(userVo.getRealname());
         studyRec.setName(userVo.getRealname());
         studyRec.setIdNum(userVo.getIdCard());
         studyRec.setIdNum(userVo.getIdCard());
-        studyRec.setMobile(userVo.getTelphone());
+        studyRec.setMobile(EncryptHandler.decryptTwo(userVo.getTelphone()));
         studyRec.setGender(userVo.getSex()==1?"男":"女");
         studyRec.setGender(userVo.getSex()==1?"男":"女");
         studyRec.setRecentPhotoSrc(Validator.isNotEmpty(userVo.getOneInchPhotos())?ossHost+"/"+userVo.getOneInchPhotos():"");
         studyRec.setRecentPhotoSrc(Validator.isNotEmpty(userVo.getOneInchPhotos())?ossHost+"/"+userVo.getOneInchPhotos():"");
         studyRec.setIdcardPhotoSrc(Validator.isNotEmpty(userVo.getIdCardImg1())?ossHost+"/"+userVo.getIdCardImg1():"");
         studyRec.setIdcardPhotoSrc(Validator.isNotEmpty(userVo.getIdCardImg1())?ossHost+"/"+userVo.getIdCardImg1():"");

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -614,7 +614,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t.tenant_name,
             t.tenant_name,
             us.create_time,
             us.create_time,
             us.subscribe_status,
             us.subscribe_status,
-            ( SELECT SUM( ueg.exam_number ) FROM user_exam_goods ueg WHERE us.order_goods_id = ueg.order_goods_id GROUP BY ueg.order_goods_id ) AS applyNum,
+            ( SELECT SUM( ueg.exam_number - eg.expend_number ) FROM user_exam_goods ueg WHERE us.order_goods_id = ueg.order_goods_id GROUP BY ueg.order_goods_id ) AS applyNum,
             us.exam_status,
             us.exam_status,
             us.result,
             us.result,
             us.performance,
             us.performance,