|  | @@ -201,18 +201,19 @@ public class ZdUnitCodeServiceImpl implements ZdUnitCodeService {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public List<ZdUnitCode> queryAllMzGhDeptInCache() {
 | 
	
		
			
				|  |  | -        List<ZdUnitCode> list = new ArrayList<>();
 | 
	
		
			
				|  |  | -        initMap(null, YesNoEnum.NO);
 | 
	
		
			
				|  |  | -        map.forEach((s, zdUnitCode) -> {
 | 
	
		
			
				|  |  | -            if (YesNoEnum.NO.code.equals(zdUnitCode.getDelFlag())) {
 | 
	
		
			
				|  |  | -//                System.out.println(zdUnitCode.getName()+zdUnitCode.getMzFlag()+zdUnitCode.getGhjzFlag());
 | 
	
		
			
				|  |  | -//                System.out.println(YesNoEnum.YES.code.equals(zdUnitCode.getMzFlag()) +"and"+ YesNoEnum.YES.code.equals(zdUnitCode.getGhjzFlag()));
 | 
	
		
			
				|  |  | -                if (YesNoEnum.YES.code.equals(zdUnitCode.getMzFlag()) && YesNoEnum.YES.code.equals(StringUtils.isEmpty(zdUnitCode.getGhjzFlag())?zdUnitCode.getGhjzFlag():Integer.parseInt(zdUnitCode.getGhjzFlag()))) {
 | 
	
		
			
				|  |  | -                    list.add(zdUnitCode);
 | 
	
		
			
				|  |  | -                }
 | 
	
		
			
				|  |  | -            }
 | 
	
		
			
				|  |  | -        });
 | 
	
		
			
				|  |  | -        return list;
 | 
	
		
			
				|  |  | +        return zdUnitCodeMapper.selectAll();
 | 
	
		
			
				|  |  | +//        List<ZdUnitCode> list = new ArrayList<>();
 | 
	
		
			
				|  |  | +//        initMap(null, YesNoEnum.NO);
 | 
	
		
			
				|  |  | +//        map.forEach((s, zdUnitCode) -> {
 | 
	
		
			
				|  |  | +//            if (YesNoEnum.NO.code.equals(zdUnitCode.getDelFlag())) {
 | 
	
		
			
				|  |  | +////                System.out.println(zdUnitCode.getName()+zdUnitCode.getMzFlag()+zdUnitCode.getGhjzFlag());
 | 
	
		
			
				|  |  | +////                System.out.println(YesNoEnum.YES.code.equals(zdUnitCode.getMzFlag()) +"and"+ YesNoEnum.YES.code.equals(zdUnitCode.getGhjzFlag()));
 | 
	
		
			
				|  |  | +//                if (YesNoEnum.YES.code.equals(zdUnitCode.getMzFlag()) && YesNoEnum.YES.code.equals(StringUtils.isEmpty(zdUnitCode.getGhjzFlag())?zdUnitCode.getGhjzFlag():Integer.parseInt(zdUnitCode.getGhjzFlag()))) {
 | 
	
		
			
				|  |  | +//                    list.add(zdUnitCode);
 | 
	
		
			
				|  |  | +//                }
 | 
	
		
			
				|  |  | +//            }
 | 
	
		
			
				|  |  | +//        });
 | 
	
		
			
				|  |  | +//        return list;
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      @Override
 |