diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java index 3b2bdf5d6..f6d120129 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java @@ -2,7 +2,6 @@ package com.logpm.supervise.vo; import com.logpm.supervise.entity.IndicatorsAnnexEntity; import com.logpm.supervise.entity.IndicatorsEntity; -import com.logpm.supervise.entity.PointsEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -37,4 +36,6 @@ public class IndicatorsVO extends IndicatorsEntity { private List files = new ArrayList<>(); + private Integer isEdit; + } 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 d80bd4777..d594ef894 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 @@ -124,15 +124,16 @@ public class ClassifyServiceImpl extends BaseServiceImpl records = pages.getRecords(); + Long userId = AuthUtil.getUserId(); + for (IndicatorsVO record : records) { Long deptId = record.getCreateDept(); String deptName = deptClient.findNameById(deptId); record.setCreateDeptName(deptName); + Long createUser = record.getCreateUser(); + if(userId.equals(createUser)){ + record.setIsEdit(1); + }else{ + record.setIsEdit(0); + } } pages.setRecords(records); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 556d5af42..272c18f97 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -943,20 +943,25 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl