BJ_FS / urbanops

Commit 75c1058bdd7c9fa3628085d43a3c15d138c71f29

Authored by wangqian
1 parent 28ae1447

派单已读优化

Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java
  View file @75c1058
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
5 import com.zteits.urbanops.framework.common.pojo.PageResult; 5 import com.zteits.urbanops.framework.common.pojo.PageResult;
6 import com.zteits.urbanops.framework.common.util.date.DateUtils; 6 import com.zteits.urbanops.framework.common.util.date.DateUtils;
7 import com.zteits.urbanops.framework.common.util.object.BeanUtils; 7 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
  8 +import com.zteits.urbanops.framework.security.core.LoginUser;
8 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoPageReqVO; 9 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoPageReqVO;
9 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoSaveReqVO; 10 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoSaveReqVO;
10 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoUpdReqVO; 11 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoUpdReqVO;
@@ -43,8 +44,7 @@ import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCo @@ -43,8 +44,7 @@ import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCo
43 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; 44 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
44 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0; 45 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0;
45 import static com.zteits.urbanops.framework.common.util.servlet.ServletUtils.getClientIP; 46 import static com.zteits.urbanops.framework.common.util.servlet.ServletUtils.getClientIP;
46 -import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;  
47 -import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname; 47 +import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.*;
48 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*; 48 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
49 49
50 /** 50 /**
@@ -133,7 +133,8 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { @@ -133,7 +133,8 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService {
133 public AssignTasksInfoDO getAssignTasksInfo(Long id) { 133 public AssignTasksInfoDO getAssignTasksInfo(Long id) {
134 AssignTasksInfoDO assignTasksInfoDO = assignTasksInfoMapper.selectById(id); 134 AssignTasksInfoDO assignTasksInfoDO = assignTasksInfoMapper.selectById(id);
135 //分公司管理员查看，变为已读 135 //分公司管理员查看，变为已读
136 - if (assignTasksInfoDO != null) { 136 + LoginUser loginUser = getLoginUser();
  137 + if (assignTasksInfoDO != null && loginUser != null) {
137 Integer newFlag = assignTasksInfoDO.getNewFlag(); 138 Integer newFlag = assignTasksInfoDO.getNewFlag();
138 if (newFlag != null && newFlag == 0) { 139 if (newFlag != null && newFlag == 0) {
139 //更新为已读 140 //更新为已读