修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -213,15 +213,18 @@ public class ExcelServiceImpl {
 
 	public void commonExport(HttpServletResponse response, ExcelDto excelDto, Map par) {
 		
-		ReginParams  reginParams=	getCurrentAllInfo();
-		 boolean authFalg= false;
-		if(reginParams ==null) {
-			authFalg=true;
-		}
-        String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
-		if(org.apache.commons.lang3.StringUtils.isBlank(bizOrgCode)){
-			authFalg=true;
-		}
+//		ReginParams  reginParams=	getCurrentAllInfo();
+//		 boolean authFalg= false;
+//		if(reginParams ==null) {
+//			authFalg=true;
+//		}
+//        String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+//		if(org.apache.commons.lang3.StringUtils.isBlank(bizOrgCode)){
+//			authFalg=true;
+//		}
+        //效验参数
+		boolean authFalg=getFlag(par);
+
 		switch (excelDto.getType()) {
 
 		case "WHP":
@@ -259,7 +262,7 @@ public class ExcelServiceImpl {
 					FireExpertsDto.class, dataSourcesImpl, false);
 			break;
 		case "SYXX":
-			if(authFalg) {
+			if(!authFalg) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
 						WaterResourceDto.class, dataSourcesImpl, false);
 				break;
@@ -286,7 +289,10 @@ public class ExcelServiceImpl {
 					AircraftDto.class, dataSourcesImpl, false);
 			break;
 		case "XFDW":
-			if(authFalg) {
+
+
+
+			if(!authFalg) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
 						FireTeamDto.class, dataSourcesImpl, false);
 				break;
@@ -296,7 +302,7 @@ public class ExcelServiceImpl {
 					FireTeamDto.class, dataSourcesImpl, false);
 			break;
 		case "WXXFZ":
-			if(authFalg) {
+			if(!authFalg) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
 						FireStationDto.class, null, false);
 				break;
@@ -312,7 +318,7 @@ public class ExcelServiceImpl {
 					FireStationDto.class, null, false);
 			break;
 		case "XFRY":
-			if(authFalg) {
+			if(!authFalg) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
 						null, FirefightersExcelDto.class, null, false);
 				break;
@@ -328,7 +334,7 @@ public class ExcelServiceImpl {
 					maintenancePersonExcelDtoList, MaintenancePersonExcleDto.class, null, false);
 			break;
 		case "KEYSITE":
-			if(authFalg) {
+			if(!authFalg) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
 						KeySiteExcleDto.class, null, false);
 				break;
@@ -348,7 +354,7 @@ public class ExcelServiceImpl {
 					KeySiteExcleDto.class, null, false);
 			break;
 		case "JCDWRY":
-			if(authFalg) {
+			if(!authFalg) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
 						OrgUsrExcelDto.class, null, false);
 				break;
@@ -1841,4 +1847,19 @@ public class ExcelServiceImpl {
 		return JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(keyString, token)).toString(),
 				ReginParams.class);
 	}
+
+	public boolean getFlag(Map par){
+
+		ReginParams  reginParams=	getCurrentAllInfo();
+		boolean authFalg= false;
+		if(reginParams!=null&&reginParams.getPersonIdentity()!=null&&reginParams.getPersonIdentity().getBizOrgCode()!=null) {
+			authFalg=true;
+		}
+		if(authFalg&&par.containsKey("bizOrgCode")&& par.get("bizOrgCode")!=null&&!(par.get("bizOrgCode").toString()).equals("")){
+          return true;
+		}
+		return false;
+	}
+
+
 }