Showing
3 changed files
with
7 additions
and
6 deletions
| @@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO; | @@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO; | ||
| 14 | import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO; | 14 | import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO; |
| 15 | import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO; | 15 | import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO; |
| 16 | import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum; | 16 | import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum; |
| 17 | +import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils; | ||
| 17 | import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; | 18 | import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; |
| 18 | import org.thingsboard.server.controller.BaseController; | 19 | import org.thingsboard.server.controller.BaseController; |
| 19 | import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService; | 20 | import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService; |
| @@ -92,6 +93,8 @@ public class TkRepairOrderController extends BaseController { | @@ -92,6 +93,8 @@ public class TkRepairOrderController extends BaseController { | ||
| 92 | throws ThingsboardException { | 93 | throws ThingsboardException { |
| 93 | params.put(PAGE, page); | 94 | params.put(PAGE, page); |
| 94 | params.put(PAGE_SIZE, pageSize); | 95 | params.put(PAGE_SIZE, pageSize); |
| 96 | + String currentUserId = getCurrentUser().getCurrentUserId(); | ||
| 97 | + params.put("userId", currentUserId); | ||
| 95 | return tkRepairOrderService.page(params); | 98 | return tkRepairOrderService.page(params); |
| 96 | } | 99 | } |
| 97 | 100 |
| @@ -9,11 +9,7 @@ import org.apache.commons.collections4.CollectionUtils; | @@ -9,11 +9,7 @@ import org.apache.commons.collections4.CollectionUtils; | ||
| 9 | import org.apache.commons.lang3.StringUtils; | 9 | import org.apache.commons.lang3.StringUtils; |
| 10 | import org.springframework.stereotype.Service; | 10 | import org.springframework.stereotype.Service; |
| 11 | import org.thingsboard.server.common.data.exception.ThingsboardException; | 11 | import org.thingsboard.server.common.data.exception.ThingsboardException; |
| 12 | -import org.thingsboard.server.common.data.id.TenantId; | ||
| 13 | import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException; | 12 | import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException; |
| 14 | -import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO; | ||
| 15 | -import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO; | ||
| 16 | -import org.thingsboard.server.common.data.yunteng.dto.TkPreserveRecordDTO; | ||
| 17 | import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO; | 13 | import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO; |
| 18 | import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum; | 14 | import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum; |
| 19 | import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils; | 15 | import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils; |
| @@ -30,7 +26,6 @@ import java.time.LocalDateTime; | @@ -30,7 +26,6 @@ import java.time.LocalDateTime; | ||
| 30 | import java.util.HashMap; | 26 | import java.util.HashMap; |
| 31 | import java.util.Map; | 27 | import java.util.Map; |
| 32 | import java.util.Optional; | 28 | import java.util.Optional; |
| 33 | -import java.util.UUID; | ||
| 34 | 29 | ||
| 35 | @Service | 30 | @Service |
| 36 | @RequiredArgsConstructor | 31 | @RequiredArgsConstructor |
| @@ -53,9 +53,12 @@ | @@ -53,9 +53,12 @@ | ||
| 53 | inner join qg_device_account da on da.id=o.device_id | 53 | inner join qg_device_account da on da.id=o.device_id |
| 54 | inner join sys_user su2 on su2.id=da.director_id | 54 | inner join sys_user su2 on su2.id=da.director_id |
| 55 | <where> | 55 | <where> |
| 56 | - <if test="queryMap.id !=null "> | 56 | + <if test="queryMap.id !=null and queryMap.id !=''"> |
| 57 | AND o.id = #{queryMap.id} | 57 | AND o.id = #{queryMap.id} |
| 58 | </if> | 58 | </if> |
| 59 | + <if test="queryMap.userId !=null and queryMap.userId !=''"> | ||
| 60 | + AND (o.report_by = #{queryMap.userId} or o.creator=#{queryMap.userId} or da.director_id=#{queryMap.userId}) | ||
| 61 | + </if> | ||
| 59 | <if test="queryMap.tenantId !=null and queryMap.tenantId !=''"> | 62 | <if test="queryMap.tenantId !=null and queryMap.tenantId !=''"> |
| 60 | AND o.tenant_id = #{queryMap.tenantId} | 63 | AND o.tenant_id = #{queryMap.tenantId} |
| 61 | </if> | 64 | </if> |