From d3efb56e8f09a01717e397944ff70b62ef5fd69b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 09 七月 2021 15:26:28 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
index 4751bc3..0cd7897 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -231,8 +231,10 @@
if(eventVisitingTasksDO!=null) {
EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
- eventVisitingTasksDetailsVO.setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
- eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
+ if(StringUtils.isNotEmpty(eventVisitingTasksDO.getVisiterTele())){
+ eventVisitingTasksDetailsVO.setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
+ eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
+ }
JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
if(jsonObject != null && jsonObject.get("check") != null){
@@ -264,7 +266,7 @@
if(StringUtils.isEmpty(idstr)){
continue;
}
- String error = addVisitingTask(Long.valueOf(idstr),communityId,userId);
+ String error = addVisitingTask(Long.valueOf(idstr),idDTO.getGridId(),userId);
if(!StringUtils.isEmpty(error)){
rt.append(error);
}
@@ -281,7 +283,7 @@
return page.getRecords();
}
- private String addVisitingTask(Long id, Long communityId,Long userId) throws Exception{
+ private String addVisitingTask(Long id, Long gridId,Long userId) throws Exception{
Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
if(CollectionUtils.isEmpty(map)){
@@ -293,6 +295,7 @@
return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
}
EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
+ visitingTasksDO.setGridId(gridId);
// visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
// visitingTasksDO.setGridMemberCommunity(communityId);
// visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
--
Gitblit v1.7.1