From 017a4a668610a554e554d910e547ae9f05537c0e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 31 三月 2025 10:30:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
index 26dcba0..b8c2b1d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.ProcessCategoryEnum;
import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.system.bo.ProcessStartBO;
import com.ruoyi.system.dto.SignContractDTO;
@@ -68,7 +69,9 @@
@Override
public PageInfo<TContract> contractList(TContractQuery query) {
PageInfo<TContract> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- List<TContract> list = this.baseMapper.contractList(query,pageInfo);
+ //获取当前登录用户信息
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
+ List<TContract> list = this.baseMapper.contractList(query,pageInfo,businessDeptId);
for (TContract tContract : list) {
tContract.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,tContract.getPayType()));
tContract.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,tContract.getStatus()));
@@ -89,7 +92,9 @@
PageInfo<TContract> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TContract> list = this.baseMapper.contractAppletList(query,pageInfo);
for (TContract tContract : list) {
- tContract.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,tContract.getPayType()));
+ tContract.setPayType(
+ DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE, tContract.getPayType())
+ );
tContract.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,tContract.getStatus()));
FlwHisTask flwHisTask = flwHisTaskMapper.selectOne(new LambdaQueryWrapper<FlwHisTask>()
.like(FlwHisTask::getVariable, tContract.getId())
--
Gitblit v1.7.1