Merge remote-tracking branch 'origin/master'

apply-net/src/main/java/com/winsun/controller/RongHeController.java

@@ -344,8 +344,10 @@ public class RongHeController {
             order.setHehuorenArea(school.getSubName());
             order.setSignImg(filePath);
             List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);
+            if (userId1 != null && userId1.size() != 0 ) {
                 SysUser user = sysUserMapper.selectById(userId1.get(0));
                 order.setSupervisorName(user.getName());
+            }
             order.setLzgh(school.getLzgh());
             // 根据订单号，获取该订单信息
             // 根据学校名称，获取该学校信息
@@ -357,7 +359,7 @@ public class RongHeController {
             orderMapper.insert(order);
             appMapper.inserOrderHis(id, "待下单！", new Date(), orderView.getOrderName());
         }catch (Exception e){
-            e.getMessage();
+            e.printStackTrace();
         }
 
         return ResponseData.success(order, "订单创建成功");