接口联调修改

@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO;
 import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum;
+import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService;
@@ -92,6 +93,8 @@ public class TkRepairOrderController extends BaseController {
             throws ThingsboardException {
         params.put(PAGE, page);
         params.put(PAGE_SIZE, pageSize);
+        String currentUserId = getCurrentUser().getCurrentUserId();
+        params.put("userId", currentUserId);
         return tkRepairOrderService.page(params);
     }
 

@@ -9,11 +9,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
-import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkPreserveRecordDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO;
 import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
@@ -30,7 +26,6 @@ import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import java.util.UUID;
 
 @Service
 @RequiredArgsConstructor

@@ -53,9 +53,12 @@
         inner join qg_device_account da on da.id=o.device_id
         inner join sys_user su2 on su2.id=da.director_id
         <where>
-            <if test="queryMap.id !=null ">
+            <if test="queryMap.id !=null and queryMap.id !=''">
                 AND o.id = #{queryMap.id}
             </if>
+            <if test="queryMap.userId !=null and queryMap.userId !=''">
+                AND (o.report_by = #{queryMap.userId} or o.creator=#{queryMap.userId} or da.director_id=#{queryMap.userId})
+            </if>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND o.tenant_id = #{queryMap.tenantId}
             </if>