From ac92b6e787cac4e6976de3e4e36427b2533c994b Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 31 Jan 2024 15:59:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/supervise/mapper/IndicatorsMapper.xml | 1 + .../logpm/supervise/service/impl/ClassifyServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml index 68d5e9f1b..3686da80e 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml @@ -7,6 +7,7 @@ select si.id id, sc.name classifyName, psc.name parentClassifyName, + psc.id parentClassifyId, si.assess_dept_name assessDeptName, si.assess_user_name assessUserName, si.point point, diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index e3376126b..883d57485 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -254,16 +254,20 @@ public class ClassifyServiceImpl extends BaseServiceImpl> listR = userClient.userInfoByDept(user.getTenantId(), instanceofDTO.getAssessDept()); + log.info(">>>>>>>>>>>>> listR {}",listR); Long userId=null; String userName=null; if(listR.isSuccess()){ List data = listR.getData(); // 获取仓库经理ID R roleIs = sysClient.getRoleIds(user.getTenantId(), "仓库经理"); + log.info(">>>>>>>>>>>>> roleIs {}",roleIs); + if(roleIs.isSuccess()){ String roleId = roleIs.getData(); for (User datum : data) { - if(datum.getPostId().contains(roleId)){ + log.info(">>>>>> women datum {}",datum); + if(datum.getRoleId().contains(roleId)){ userId=datum.getId(); userName=datum.getRealName(); }