From a1e30f41fa0ff29822f5665f3a4aecd659890fc0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期日, 15 八月 2021 12:13:50 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
index 50d54ad..47e348a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
@@ -43,8 +43,8 @@
@PostMapping("/app/pagePatrolRecord")
public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
Long communityId = this.getCommunityId();
- if (comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) {
- comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getUserId()));
+ if (!comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) {
+ comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getPhone()));
}
comSwPatrolRecordPageDTO.setCommunityId(communityId);
return communityService.pagePatrolRecord(comSwPatrolRecordPageDTO);
@@ -60,6 +60,7 @@
public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO){
Long communityId = this.getCommunityId();
comSwPatrolRecordAddDTO.setCommunityId(communityId);
+ comSwPatrolRecordAddDTO.setCreateBy(this.getUserId());
return communityService.addPatrolRecord(comSwPatrolRecordAddDTO);
}
@@ -97,7 +98,8 @@
@ApiOperation(value = "根据安全工作记录id查询详情", response = ComSwSafetyWorkRecordVO.class)
@GetMapping("/app/detailSafetyWorkRecord")
public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
- return communityService.detailSafetyWorkRecord(safetyWorkRecordId);
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ return communityService.detailSafetyWorkRecord(safetyWorkRecordId, communityId);
}
/**
--
Gitblit v1.7.1