From 4f0ab5fbe931949871b2a777c90f00f3661404c6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 13 Mar 2024 08:46:05 +0800
Subject: [PATCH] fix:走航日报补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 33da3f2..1b762a6 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -217,8 +217,12 @@
result.put("userId", user.getId());
result.put("account", user.getAccount());
ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(user.getUnitId());
+ //������������������
List<Integer> list = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_DEVICE.value, user.getId());
+ //������������������������
+ List<Integer> handList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_HAND_DEVICE.value, user.getId());
result.put("device",ObjectUtils.isEmpty(list)? StateEnum.NOT_EFFECTIVE.value : StateEnum.TAKE_EFFECT.value);
+ result.put("handDevice",ObjectUtils.isEmpty(handList)? StateEnum.NOT_EFFECTIVE.value : StateEnum.TAKE_EFFECT.value);
result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������");
result.put("openId",openid);
Map<String, Object> userInfo = new LinkedHashMap<>();
@@ -330,7 +334,7 @@
ResponseEntity<String> responseEntity =
restTemplate.postForEntity(url, wxMssVo, String.class);
String body = responseEntity.getBody();
- log.info("������:"+body+"������:"+user.getAccount());
+ log.info("������:"+body+"������:"+user.getAccount()+"openID"+user.getOpenId());
}
}
--
Gitblit v1.8.0