|  | @@ -53,10 +53,9 @@ public class TheOrderController extends BaseController {
 | 
												
													
														
															|  |          theLeadership.setCorrelationId(userId);
 |  |          theLeadership.setCorrelationId(userId);
 | 
												
													
														
															|  |          List<TheLeadership> listUserId = theLeadershipService.findListUserId(theLeadership);
 |  |          List<TheLeadership> listUserId = theLeadershipService.findListUserId(theLeadership);
 | 
												
													
														
															|  |          if (listUserId.size()>0){
 |  |          if (listUserId.size()>0){
 | 
												
													
														
															|  | -            theLeadership.setTeam(listUserId.get(0).getTeam());
 |  | 
 | 
												
													
														
															|  | -            theOrder.setDepartment("2");//全显示
 |  | 
 | 
												
													
														
															|  | -            theLeadership.setSpecific(listUserId.get(0).getSpecific());
 |  | 
 | 
												
													
														
															|  | -            theLeadership.setDepartment(listUserId.get(0).getDepartment());
 |  | 
 | 
												
													
														
															|  | 
 |  | +            theOrder.setTeam(listUserId.get(0).getTeam());
 | 
												
													
														
															|  | 
 |  | +            theOrder.setSpecific(listUserId.get(0).getSpecific());
 | 
												
													
														
															|  | 
 |  | +            theOrder.setDepartment(listUserId.get(0).getDepartment());
 | 
												
													
														
															|  |              theOrder.setStatus("0"); //是回显
 |  |              theOrder.setStatus("0"); //是回显
 | 
												
													
														
															|  |          }else {
 |  |          }else {
 | 
												
													
														
															|  |              theLeadership.setTeam("");
 |  |              theLeadership.setTeam("");
 | 
												
											
												
													
														
															|  | @@ -70,7 +69,7 @@ public class TheOrderController extends BaseController {
 | 
												
													
														
															|  |      //获取--预定餐
 |  |      //获取--预定餐
 | 
												
													
														
															|  |      @ResponseBody
 |  |      @ResponseBody
 | 
												
													
														
															|  |      @RequestMapping(value = "noSureTem")
 |  |      @RequestMapping(value = "noSureTem")
 | 
												
													
														
															|  | -    public AjaxJson getReservation(TheOrder theOrder){
 |  | 
 | 
												
													
														
															|  | 
 |  | +    public AjaxJson getReservation(TheOrder theOrder) throws Exception{
 | 
												
													
														
															|  |          DateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 |  |          DateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 | 
												
													
														
															|  |          DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 |  |          DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 | 
												
													
														
															|  |          Date date = new Date();//当前时间
 |  |          Date date = new Date();//当前时间
 |