限制飞手团队只能查看自己团队飞手的订单

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/ServiceOrderQO.java

 package com.mmc.csf.infomation.qo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.mmc.csf.release.model.group.Freeze;
 import com.mmc.csf.release.model.group.Page;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,7 @@ import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Author small
@@ -39,6 +41,9 @@ public class ServiceOrderQO {
     @Min(value = 1, groups = Page.class)
     private Integer pageSize;
 
+    @ApiModelProperty(value = "查询指定飞手列表中飞手的订单")
+    @JsonIgnore
+    private List<Integer> pilotUserIdList;
     public void buildCurrentPage() {
         this.pageNo = (pageNo - 1) * pageSize;
     }

release-service/src/main/java/com/mmc/csf/release/feign/UserAppApi.java

@@ -74,4 +74,7 @@ public interface UserAppApi {
 
     @PostMapping("/userapp/userPoint/change")
     public ResultBody changeUserPoint(@RequestBody ChangeUserPointVO changePoint, @RequestHeader("token") String token);
+
+    @GetMapping("/userapp/pilot/selectPilotIdList")
+    List<Integer> feignGetPilotIdList(@RequestHeader("token") String token);
 }

release-service/src/main/java/com/mmc/csf/release/feign/hystrix/UserAppApiHystrix.java

@@ -54,4 +54,12 @@ public class UserAppApiHystrix implements UserAppApi {
         log.error("发放积分 熔断：changeUserPoint：{}", JSONObject.toJSON(changePoint));
         return ResultBody.error(ResultEnum.OPERATION_SYS_ERROR);
     }
+
+    @Override
+    public List<Integer> feignGetPilotIdList(String token) {
+        log.error("熔断：feignGetUserSimpleInfo");
+        return null;
+    }
+
+
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/BackRequirementsServiceImpl.java

@@ -5,12 +5,13 @@ import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.config.IsNullConvertZeroUtil;
 import com.mmc.csf.infomation.dto.*;
 import com.mmc.csf.infomation.qo.ServiceOrderQO;
+import com.mmc.csf.infomation.vo.RequireEveryStatusVO;
 import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
 import com.mmc.csf.release.dao.BackRequirementsDao;
 import com.mmc.csf.release.dao.RequirementsDao;
-import com.mmc.csf.infomation.vo.RequireEveryStatusVO;
 import com.mmc.csf.release.entity.requirements.ServiceOrderFormDO;
 import com.mmc.csf.release.entity.requirements.ServiceOrderFormDetailsDO;
+import com.mmc.csf.release.feign.UserAppApi;
 import com.mmc.csf.release.service.BackRequirementsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,8 +32,22 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
     @Autowired
     private RequirementsDao requirementsDao;
 
+    @Autowired
+    private UserAppApi userAppApi;
+
     @Override
     public PageResult serviceOrderFormList(ServiceOrderQO param, LoginSuccessDTO userLoginInfoFromRedis) {
+
+        //权限限制，除了admin以外其他飞手团队后台账号只能看到自己团队里面飞手接的订单
+        Integer userAccountId = userLoginInfoFromRedis.getUserAccountId();
+        if(userAccountId != 1) {
+            List<Integer> pilotUserIdList = userAppApi.feignGetPilotIdList(userLoginInfoFromRedis.getToken());
+            if(pilotUserIdList == null) {
+                return PageResult.buildPage(param.getPageNo(), param.getPageSize(), 0);
+            }
+            param.setPilotUserIdList(pilotUserIdList);
+        }
+
         int count = backRequirementsDao.countService(param);
         if (count == 0) {
             return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);

release-service/src/main/resources/application-local.yml

@@ -143,7 +143,7 @@ ribbon:
 
 iuav:
   userapp:
-    url: http://cms-svc:35150
+    url: http://localhost:35150
   pmsapp:
     url: http://pms-svc:8099
   omsapp:

release-service/src/main/resources/mapper/requirements/BackRequirementsDao.xml

@@ -76,6 +76,12 @@
         LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
         WHERE
         ri.publish =1
+        <if test="pilotUserIdList != null">
+            AND rs.pilot_certification_user_id IN
+            <foreach item="item" collection="pilotUserIdList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test=" publishPhone != null and publishPhone!='' ">
             and ri.publish_phone = #{publishPhone}
         </if>
@@ -95,10 +101,16 @@
         FROM
         requirements_info ri
         LEFT JOIN requirements_amount ra ON ri.id = ra.requirements_info_id
-        LEFT JOIN requirements_service rs ON rs.requirements_info_id = ra.id
+        LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
         LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
         WHERE
         ri.publish =1
+        <if test="pilotUserIdList != null">
+            AND rs.pilot_certification_user_id IN
+            <foreach item="item" collection="pilotUserIdList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test=" publishPhone != null and publishPhone!='' ">
             and ri.publish_phone = #{publishPhone}
         </if>