|
@@ -187,21 +187,24 @@ public class FlowableTaskController {
|
|
|
String code =(String) RedisUtils.getInstance().get(CacheNames.CCPM_IS_CONNECT, "ccpm");
|
|
|
|
|
|
UserDTO currentUserDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
|
|
|
- if (StringUtils.isNotBlank(code)){
|
|
|
- if (!"1".equals(code)){
|
|
|
+ //判定如果当前登陆人是否可以查看其他服务的待办信息
|
|
|
+ if ("1".equals(currentUserDTO.getOtherServiceFlag())) {
|
|
|
+ if (StringUtils.isNotBlank(code)) {
|
|
|
+ if (!"1".equals(code)) {
|
|
|
+ Object response = flowRequest.getNotifyList(flow, belongProject, currentUserDTO);
|
|
|
+ if (Objects.nonNull(response)) {
|
|
|
+ RedisUtils.getInstance().set(CacheNames.CCPM_IS_CONNECT, "ccpm", "1");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ //为空则说明第一次连接,进行存值
|
|
|
Object response = flowRequest.getNotifyList(flow, belongProject, currentUserDTO);
|
|
|
if (Objects.nonNull(response)) {
|
|
|
RedisUtils.getInstance().set(CacheNames.CCPM_IS_CONNECT, "ccpm", "1");
|
|
|
+ } else {
|
|
|
+ RedisUtils.getInstance().set(CacheNames.CCPM_IS_CONNECT, "ccpm", "0");
|
|
|
}
|
|
|
}
|
|
|
- }else {
|
|
|
- //为空则说明第一次连接,进行存值
|
|
|
- Object response = flowRequest.getNotifyList(flow, belongProject, currentUserDTO);
|
|
|
- if (Objects.nonNull(response)) {
|
|
|
- RedisUtils.getInstance().set(CacheNames.CCPM_IS_CONNECT, "ccpm", "1");
|
|
|
- }else {
|
|
|
- RedisUtils.getInstance().set(CacheNames.CCPM_IS_CONNECT, "ccpm", "0");
|
|
|
- }
|
|
|
}
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|