diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java index 08d36d26..c28d4ccd 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java @@ -231,7 +231,19 @@ public class ExcelController extends AbstractController { String newCondition = prams.toString(); pramsMap.put("conditions", newCondition); } else { - prams.put("gfsh", gfsh); + String gfmc = ""; + List org = getUserInfo().getOrg(); + if (org != null && org.size() > 0) { + for (Tax tax : org) { + if (tax.getTaxno().equals(gfsh)) { + gfmc = tax.getTaxname(); + } + } + } + prams.put("gfmc", gfmc); + prams.put("gfsh",gfsh); + String newCondition = prams.toString(); + pramsMap.put("conditions", newCondition); } } else { pramsMap.put("conditions", condition);