app对应bug修改

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/interceptors/PermissionInterceptor.java

@@ -193,7 +193,7 @@ public class PermissionInterceptor implements Interceptor {
             authSql = " 1=2";
         } else {
             // 解析数据权限sql
-            authSql = parseDataAuthorization(dataAuthorization, reginParams, mainTableAlias, boundSql);
+            authSql = parseDataAuthorization(nonEmptyDataAuthorization, reginParams, mainTableAlias, boundSql);
         }
         // 替换数据权限
         if (!ValidationUtil.isEmpty(authSql)) {

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/dto/DangerDto.java

@@ -85,6 +85,11 @@ public class DangerDto implements Serializable {
     private List<String> photoUrl;
 
     /**
+     * 隐患图片列表
+     */
+    private String photoUrls;
+
+    /**
      * 检查项名称
      */
     private String inputItemName;

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -568,7 +568,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         JSONObject respBody;
         Date startDate = new Date();
         if (latentDangerListParam.getIsHandle()) {
-            respBody = remoteWorkFlowService.completedPageTask(user.getRealName(),latentDangerListParam.getBelongType());
+            respBody = remoteWorkFlowService.completedPageTask(user.getUserName(),latentDangerListParam.getBelongType());
         } else {
             respBody = remoteWorkFlowService.pageTask(user.getUserId(),latentDangerListParam.getBelongType());
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerDto.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.supervision.business.dto;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author DELL
@@ -84,4 +85,9 @@ public class HiddenDangerDto {
      * 检查项名称
      */
     private String inputItemName;
+
+    /**
+     * 隐患图片
+     */
+    private List<String> photoUrl;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/JCSFeignClient.java

@@ -45,4 +45,13 @@ public interface JCSFeignClient {
      */
     @RequestMapping(value = "jcs/org-usr/amos/companyIds", method = RequestMethod.GET)
     FeignClientResult<Map<String, Integer>> getDeptCountByCompanyIds(@RequestParam("companyIdList") List<String> companyIdList);
+
+    /**
+     * 根据机场单位id获取单位详情
+     *
+     * @param companyId 机场单位id
+     * @return
+     */
+    @RequestMapping(value = "jcs/org-usr/getUnit/{id}", method = RequestMethod.GET)
+    FeignClientResult<Map<String, Object>> getCompanyById(@PathVariable("id") String companyId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -22,6 +22,7 @@ import com.yeejoin.amos.supervision.business.dto.HiddenDangerExportDataDto;
 import com.yeejoin.amos.supervision.business.dto.HiddenDangerImportDto;
 import com.yeejoin.amos.supervision.business.dto.HiddenDangerTemplateDto;
 import com.yeejoin.amos.supervision.business.feign.DangerFeignClient;
+import com.yeejoin.amos.supervision.business.feign.JCSFeignClient;
 import com.yeejoin.amos.supervision.business.service.intfc.IHiddenDangerService;
 import com.yeejoin.amos.supervision.common.enums.CheckTypeSuEnum;
 import com.yeejoin.amos.supervision.common.enums.DangerCheckTypeLevelEnum;
@@ -38,6 +39,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
 import javax.servlet.http.HttpServletResponse;
@@ -87,6 +89,9 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
     @Autowired
     IPointDao iPointDao;
 
+    @Autowired
+    JCSFeignClient jcsFeignClient;
+
     @Override
     public List<HiddenDangerExportDataDto> listAll(String planId, Long pointId, String level, String status) {
         //1.查询指定计划和公司的关联隐患数据
@@ -289,6 +294,11 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         result.put("checkUnitName",plan.getCheckUnitName());
         result.put("leadPeopleId", plan.getLeadPeopleIds());
         result.put("leadPeopleName", plan.getLeadPeopleNames());
+        // TODO tb 将机场单位bizOrgCode保存起来用于数据过滤
+        FeignClientResult<Map<String, Object>> companyResult = jcsFeignClient.getCompanyById(point.getOriginalId());
+        if (!ValidationUtil.isEmpty(companyResult)) {
+            result.put("bizOrgCode", companyResult.getResult().get("bizOrgCode"));
+        }
         this.buildCheckInfo(result, hiddenDangerDto.getCheckInputId());
         return result;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PointServiceImpl.java

@@ -1218,7 +1218,15 @@ public class PointServiceImpl implements IPointService {
             }
             List<DangerDto> dangerDtoList = listFeignClientResult.getResult();
             if (!ObjectUtils.isEmpty(dangerDtoList)) {
-                collect = dangerDtoList.stream().collect(Collectors.groupingBy(DangerDto::getBizId, Collectors.toList()));
+                dangerDtoList.forEach(dangerDto -> {
+                    List<String> photoUrl = Lists.newArrayList();
+                    if (!ValidationUtil.isEmpty(dangerDto.getPhotoUrls())) {
+                        photoUrl = Arrays.asList(dangerDto.getPhotoUrls().split(","));
+                    }
+                    dangerDto.setPhotoUrl(photoUrl);
+                });
+                collect = dangerDtoList.stream().collect(Collectors.groupingBy(DangerDto::getBizId,
+                        Collectors.toList()));
             }
         }