From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
index b34227d..d646f8f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
@@ -74,7 +74,7 @@
}
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
commonEventAddDTO.setUserId(loginUserInfoVO.getUserId());
- commonEventAddDTO.setUserName(loginUserInfoVO.getName());
+ commonEventAddDTO.setUserName(loginUserInfoVO.getNickName());
commonEventAddDTO.setPhone(loginUserInfoVO.getPhone());
return gridService.addCommon(commonEventAddDTO);
}
@@ -94,7 +94,7 @@
}
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
commonEventEditDTO.setUserId(loginUserInfoVO.getUserId());
- commonEventEditDTO.setUserName(loginUserInfoVO.getName());
+ commonEventEditDTO.setUserName(loginUserInfoVO.getNickName());
commonEventEditDTO.setPhone(loginUserInfoVO.getPhone());
return gridService.saveDraft(commonEventEditDTO);
}
@@ -110,7 +110,8 @@
LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
ClazzUtils.setIfStringIsEmpty(commonEventReportDTO);
commonEventReportDTO.setUserId(loginUserInfoVO.getUserId());
- commonEventReportDTO.setUserName(loginUserInfoVO.getName());
+ commonEventReportDTO.setUserName(loginUserInfoVO.getNickName());
+ commonEventReportDTO.setCommunityId(loginUserInfoVO.getCommunityId());
return gridService.report(commonEventReportDTO);
}
@@ -125,8 +126,10 @@
ClazzUtils.setIfStringIsEmpty(commonEventDealDTO);
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
commonEventDealDTO.setUserId(loginUserInfoVO.getUserId());
- commonEventDealDTO.setUserName(loginUserInfoVO.getName());
+ commonEventDealDTO.setUserName(loginUserInfoVO.getNickName());
commonEventDealDTO.setOperateType(0);
+ commonEventDealDTO.setCommunityId(loginUserInfoVO.getCommunityId());
+ commonEventDealDTO.setCommunityName(loginUserInfoVO.getCommunityName());
return gridService.dealEvent(commonEventDealDTO);
}
@@ -141,7 +144,7 @@
ClazzUtils.setIfStringIsEmpty(commonEventVerifyDTO);
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
commonEventVerifyDTO.setUserId(loginUserInfoVO.getUserId());
- commonEventVerifyDTO.setUserName(loginUserInfoVO.getName());
+ commonEventVerifyDTO.setUserName(loginUserInfoVO.getNickName());
return gridService.verifyEvent(commonEventVerifyDTO);
}
--
Gitblit v1.7.1