MERGE

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

@@ -1767,7 +1767,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             //跟新用户资料
             user.setRealname(item.getUserName());
             if (ObjectUtils.isNotNull(item.getUserPhone())){
-                user.setTelphone(EncryptHandler.encrypt(item.getUserPhone()));
+                user.setTelphone(item.getUserPhone());
             }
             if (ObjectUtils.isNotNull(item.getSex())){
                 user.setSex(StringUtils.isNotBlank(item.getSex()) && item.getSex().equals("男") ? 1:2);

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/impl/OssServiceImpl.java

@@ -230,6 +230,10 @@ public class OssServiceImpl implements OssService {
             case 11:
                 RandomFilename = "file/pdf/" +(sdf.format(new Date())) + "/" + now + ".pdf";
                 break;
+            case 12:
+                String filename = ossRequest.getFile().getOriginalFilename();
+                RandomFilename = "file/dangan/upload/"+ filename.substring(0, filename.lastIndexOf("."));
+                break;
         }
 
         return RandomFilename;

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -2070,7 +2070,7 @@
         <if test="goodsName != null and goodsName !='' ">
             AND g.goods_name like concat('%', #{goodsName}, '%'))
         </if>
-        <if test="subscribeStatus != null and subscribeStatus != 1">
+        <if test="subscribeStatus != null and subscribeStatus == 1">
             AND us.subscribe_status = 1 AND (TIME_TO_SEC(us.apply_site_end_time) + us.apply_site_exam_time) &gt; UNIX_TIMESTAMP()
         </if>
         <if test="subscribeStatus != null and subscribeStatus == 2">