diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java index 97d46cf7..badb4cf7 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java @@ -46,4 +46,6 @@ public class ContractFileModel { private List list; private String creatorTime; private String code; + private String orgnizeId; + private String departmentId; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java index 5cb439e9..d4e31264 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java @@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.hutool.core.util.ObjectUtil; import jnpf.customer.mapper.CustomerVMapper; import jnpf.customer.entity.CustomerEntity; +import jnpf.permission.entity.UserEntity; +import jnpf.permission.mapper.UserMapper; import jnpf.permission.model.authorize.AuthorizeConditionModel; import jnpf.contractfile.model.contractfile.ContractFilePagination; import jnpf.permission.service.AuthorizeService; @@ -62,6 +64,9 @@ public class ContractFileServiceImpl extends ServiceImpl getList(ContractFilePagination contractFilePagination) { @@ -384,8 +389,14 @@ public class ContractFileServiceImpl extends ServiceImpl dt) { + String userId=userProvider.get().getUserId(); for (ContractFileModel model : dt) { - + QueryWrapper queryuser = new QueryWrapper(); + queryuser.eq("F_Id",userId); + List listuser = userMapper.selectList(queryuser); + if (listuser.size() > 0) { + model.setOrgnizeId(listuser.get(0).getOrganizeId()); + } model.setCreatorTime(DateUtil.cstFormat(model.getCreatorTime())); // model.setNum(DateUtil.cstFormat(model.getNum())); if (model.getContractType() != null) {