|  | @@ -438,7 +438,7 @@ public class WorkAskCheckPriceController extends BaseController {
 | 
												
													
														
															|  |  							}
 |  |  							}
 | 
												
													
														
															|  |  						}
 |  |  						}
 | 
												
													
														
															|  |  						workAskCheckPrice.setAct(a);
 |  |  						workAskCheckPrice.setAct(a);
 | 
												
													
														
															|  | -						/*if (com.jeeplus.common.utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
 |  | 
 | 
												
													
														
															|  | 
 |  | +						/*if (com.jeeplus.common.Utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
 | 
												
													
														
															|  |  							workEngineeringProject.setName(officeService.get(companyId).getName());
 |  |  							workEngineeringProject.setName(officeService.get(companyId).getName());
 | 
												
													
														
															|  |  						}*/
 |  |  						}*/
 | 
												
													
														
															|  |  						lists.add(workAskCheckPrice);
 |  |  						lists.add(workAskCheckPrice);
 | 
												
											
												
													
														
															|  | @@ -451,7 +451,7 @@ public class WorkAskCheckPriceController extends BaseController {
 | 
												
													
														
															|  |  						}
 |  |  						}
 | 
												
													
														
															|  |  					}
 |  |  					}
 | 
												
													
														
															|  |  					workAskCheckPrice.setAct(a);
 |  |  					workAskCheckPrice.setAct(a);
 | 
												
													
														
															|  | -					/*if (com.jeeplus.common.utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
 |  | 
 | 
												
													
														
															|  | 
 |  | +					/*if (com.jeeplus.common.Utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
 | 
												
													
														
															|  |  						workEngineeringProject.setName(officeService.get(companyId).getName());
 |  |  						workEngineeringProject.setName(officeService.get(companyId).getName());
 | 
												
													
														
															|  |  					}*/
 |  |  					}*/
 | 
												
													
														
															|  |  					lists.add(workAskCheckPrice);
 |  |  					lists.add(workAskCheckPrice);
 | 
												
											
												
													
														
															|  | @@ -490,7 +490,7 @@ public class WorkAskCheckPriceController extends BaseController {
 | 
												
													
														
															|  |  						a.getVars().getMap().put("applyUserId",UserUtils.get(a.getVars().getMap().get("applyUserId").toString()).getName());
 |  |  						a.getVars().getMap().put("applyUserId",UserUtils.get(a.getVars().getMap().get("applyUserId").toString()).getName());
 | 
												
													
														
															|  |  					}
 |  |  					}
 | 
												
													
														
															|  |  					workAskCheckPrice.setAct(a);
 |  |  					workAskCheckPrice.setAct(a);
 | 
												
													
														
															|  | -					/*if (com.jeeplus.common.utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
 |  | 
 | 
												
													
														
															|  | 
 |  | +					/*if (com.jeeplus.common.Utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
 | 
												
													
														
															|  |  						workEngineeringProject.setName(officeService.get(companyId).getName());
 |  |  						workEngineeringProject.setName(officeService.get(companyId).getName());
 | 
												
													
														
															|  |  					}*/
 |  |  					}*/
 | 
												
													
														
															|  |  					lists.add(workAskCheckPrice);
 |  |  					lists.add(workAskCheckPrice);
 |