|  | @@ -96,6 +96,7 @@ public class SerialNumTplService extends CrudService<SerialNumTplDao, SerialNumT
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  |  			SerialNumTpl numTpl = this.querySerialTpl(office, bizCode);
 |  |  			SerialNumTpl numTpl = this.querySerialTpl(office, bizCode);
 | 
												
													
														
															|  |  			if (numTpl==null){
 |  |  			if (numTpl==null){
 | 
												
													
														
															|  | 
 |  | +//			    查询编号模板   {brspnm}DZ-{year}-{serialNum}
 | 
												
													
														
															|  |                  SerialNumTpl serialNumTpl = dao.queryByComAndBizCode("0", bizCode);
 |  |                  SerialNumTpl serialNumTpl = dao.queryByComAndBizCode("0", bizCode);
 | 
												
													
														
															|  |                  serialNumTpl.setCompany(company);
 |  |                  serialNumTpl.setCompany(company);
 | 
												
													
														
															|  |                  serialNumTpl.setSerialNum(0);
 |  |                  serialNumTpl.setSerialNum(0);
 | 
												
											
												
													
														
															|  | @@ -108,10 +109,10 @@ public class SerialNumTplService extends CrudService<SerialNumTplDao, SerialNumT
 | 
												
													
														
															|  |  			if (numTpl==null){
 |  |  			if (numTpl==null){
 | 
												
													
														
															|  |                  throw new Exception("生成编号失败,请先设置相关业务编号模板");
 |  |                  throw new Exception("生成编号失败,请先设置相关业务编号模板");
 | 
												
													
														
															|  |              }
 |  |              }
 | 
												
													
														
															|  | -            if ("0".equals(office.getParent().getId()))office.setParent(null);
 |  | 
 | 
												
													
														
															|  | 
 |  | +            if ("0".equals(office.getParent().getId()))
 | 
												
													
														
															|  | 
 |  | +                office.setParent(null);
 | 
												
													
														
															|  |              String year = DateUtils.formatDate(new Date(), "yyyy");
 |  |              String year = DateUtils.formatDate(new Date(), "yyyy");
 | 
												
													
														
															|  |  			if(!year.equals(numTpl.getYearBuilt())){
 |  |  			if(!year.equals(numTpl.getYearBuilt())){
 | 
												
													
														
															|  | -				//新年,重置SerialNum
 |  | 
 | 
												
													
														
															|  |  				dao.resetSerialNum(numTpl.getId(),numTpl.getYearBuilt(),year);
 |  |  				dao.resetSerialNum(numTpl.getId(),numTpl.getYearBuilt(),year);
 | 
												
													
														
															|  |  			}
 |  |  			}
 | 
												
													
														
															|  |              Map<String, String> map = new HashMap<>();
 |  |              Map<String, String> map = new HashMap<>();
 |