Merge remote-tracking branch 'origin/master'

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquLubricationPlanServiceImpl.java

@@ -55,12 +55,7 @@ public class EquLubricationPlanServiceImpl extends ServiceImpl<EquLubricationPla
     @Override
     public void wordExportLubrication(Map<String, Object> parameter, HttpServletResponse response) {
         log.info("开始导出润滑明细");
-        SysUserVo currentUser = CommonUtils.getCurrentUser();
-        String tenantId = "";
-        //判断当前是否存在集团领导角色
-        if (currentUser.getSysuserroleids().contains("d7797802376e42b2af37781f258b99fb")){
-            tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
-        }
+        String tenantId = parameter.get("userTopOrg").toString();
         List<EquLubricationPlanDetailVo> planDetailList = equLubricationPlanDetailService.queryAllDetailList(tenantId);
         try {
             response.setContentType("application/octet-stream");

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquLubricationTaskManagementServiceImpl.java

@@ -48,12 +48,7 @@ public class EquLubricationTaskManagementServiceImpl extends ServiceImpl<EquLubr
     @Override
     public void wordExportLubricationTask(Map<String, Object> parameter, HttpServletResponse response) {
         log.info("开始导出润滑任务明细");
-        SysUserVo currentUser = CommonUtils.getCurrentUser();
-        String tenantId = "";
-        //判断当前是否存在集团领导角色
-        if (currentUser.getSysuserroleids().contains("d7797802376e42b2af37781f258b99fb")){
-            tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
-        }
+        String tenantId = parameter.get("userTopOrg").toString();
         List<EquLubricationTaskDetailVo> taskDetailVoList = equLubricationTaskDetailService.queryAllTaskDetailList(tenantId);
         try {
             response.setContentType("application/octet-stream");