diff --git a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index 2749bc113..eb7a75c87 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -41,13 +41,13 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile)); -// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); - PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); + PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); // dubbo注册 PropsUtil.setProperty(props, "dubbo.application.name", appName); PropsUtil.setProperty(props, "dubbo.application.qos.enable", "false"); diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java index 409f966d0..cb17f4033 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java @@ -39,5 +39,7 @@ public class ClassifyVO extends ClassifyEntity { private List pointsEntities = new ArrayList<>(); + private List pointsVOS ; + } diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java index 343a7c94a..d5d47ee65 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java @@ -2,7 +2,6 @@ package com.logpm.supervise.vo.api; import com.logpm.supervise.entity.ClassifyEntity; -import com.logpm.supervise.entity.PointsEntity; import com.logpm.supervise.vo.PointsVO; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index d98d3963b..a1cf6990a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -511,7 +511,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl select * from sup_indicators_annex - where indicators_id = #{indicatorsId} - and `type` = #{type} + where and indicators_id = #{id} + and type = #{type} 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 ecfb2b048..5a0533953 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 @@ -9,6 +9,7 @@ sc.name classifyName, psc.id parentClassifyId, 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(); }