fix

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

@@ -1779,7 +1779,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 //获取用户订单
                 List<Order> userOrderList = iOrderService.list(new LambdaQueryWrapper<Order>().eq(Order::getUserId, userId).in(Order::getStatus, 1).in(Order::getPayStatus, 1, 2, 3)
                         .in(Order::getOrderStatus, 1));
-                if (!userOrderList.isEmpty()) {
+                if (userOrderList.isEmpty()) {
+                    UserDataExcelBo userBo = BeanUtil.toBean(user, UserDataExcelBo.class);
+                    userBo.setCreateTime("");
+                    userBo.setRegisterTime(DateUtils.timestampToDateFormat(user.getCreateTime(), "yyyy/MM/dd HH:mm:ss"));
+                    userBo.setSex(ObjectUtil.isNotNull(user.getSex()) && user.getSex() == 1 ? "男" : "女");
+                    userBo.setUserPhone(EncryptHandler.decrypt(user.getTelphone()));
+                    userBo.setUserCard(EncryptHandler.decrypt(user.getIdCard()));
+                    userBo.setMajor(user.getMajor());
+                    userList.add(userBo);
+                } else {
                     userOrderList.forEach(order -> {
                         //获取用户课程列表
                         List<OrderGoods> userOrderGoodsList = iOrderGoodsService.list(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderSn, order.getOrderSn()).in(OrderGoods::getPayStatus, 2, 3, 4)
@@ -2333,7 +2342,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 OssRequest ossRequest1 = new OssRequest();
                 ossRequest1.setGradeId(0L);
                 ossRequest1.setUserId(0L);
-                ossRequest1.setImageStatus(12);
+                ossRequest1.setImageStatus(6);
                 File file2 = new File(zipPath);
                 ossRequest1.setFile(FileUtils.getMultipartFile(file2));
                 excelPath = ossService.upload(ossRequest1);