From 47d330d27fb88e85a40e64e5423f73b0b29c088e Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期一, 17 三月 2025 17:03:22 +0800
Subject: [PATCH] 修改
---
signature/src/main/java/com/gkhy/sign/service/impl/SignatureItemServiceImpl.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/signature/src/main/java/com/gkhy/sign/service/impl/SignatureItemServiceImpl.java b/signature/src/main/java/com/gkhy/sign/service/impl/SignatureItemServiceImpl.java
index 3f0e5d3..d3d14bf 100644
--- a/signature/src/main/java/com/gkhy/sign/service/impl/SignatureItemServiceImpl.java
+++ b/signature/src/main/java/com/gkhy/sign/service/impl/SignatureItemServiceImpl.java
@@ -1,6 +1,8 @@
package com.gkhy.sign.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageInfo;
+import com.gkhy.sign.dto.rep.SignatureFlowRep;
import com.gkhy.sign.dto.rep.SignatureItemRep;
import com.gkhy.sign.dto.req.SignatureItemReq;
import com.gkhy.sign.entity.SignatureFlow;
@@ -9,7 +11,9 @@
import com.gkhy.sign.mapper.SignatureItemMapper;
import com.gkhy.sign.service.SignatureItemService;
import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysUserMapper;
@@ -35,9 +39,15 @@
@Override
public List<SignatureItemRep> selectItemList(SignatureItemReq signatureItem) {
- SysUser user = SecurityUtils.getLoginUser().getUser();
- signatureItem.setUserId(user.getUserId());
- return signatureItemMapper.getItemList(signatureItem);
+ if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+ signatureItem.setUserId(SecurityUtils.getUserId());
+ }
+ List<SignatureItemRep> itemList = signatureItemMapper.getItemList(signatureItem);
+ for (SignatureItemRep signatureItemRep : itemList) {
+ List<SignatureFlowRep> signatureFlowReps = signatureFlowMapper.selectbyItemId(signatureItemRep.getId());
+ signatureItemRep.setSignatureFlows(signatureFlowReps);
+ }
+ return itemList;
}
@Override
@@ -48,20 +58,23 @@
signatureItem.setOriginateTime(new Date());
int insert = signatureItemMapper.insertSignatureItem(signatureItem);
+ List<SignatureFlowRep> signatureFlowReps = signatureFlowMapper.selectbyItemId(signatureItem.getId());
SignatureFlow signatureFlow = new SignatureFlow();
- signatureFlow.setItemId(insert);
+ signatureFlow.setItemId(signatureItem.getId());
signatureFlow.setUserId(SecurityUtils.getUserId());
- signatureFlow.setUserName(SecurityUtils.getUsername());
+ SysUser sysUser2 = sysUser.selectUserById(SecurityUtils.getUserId());
+ signatureFlow.setUserName(sysUser2.getNickName());
signatureFlow.setDeptId(SecurityUtils.getDeptId());
SysDept sysDept = sysDeptMapper.selectDeptById(SecurityUtils.getDeptId());
signatureFlow.setDeptName(sysDept.getDeptName());
signatureFlow.setSignUserId(signatureItem.getInitiaiUserId());
SysUser sysUser1 = sysUser.selectUserById(signatureItem.getInitiaiUserId());
SysDept sysDept1 = sysDeptMapper.selectDeptById(sysUser1.getDeptId());
- signatureFlow.setSignUserName(sysUser1.getUserName());
+ signatureFlow.setSignUserName(sysUser1.getNickName());
signatureFlow.setSignDeptId(sysDept1.getDeptId());
signatureFlow.setSignDeptName(sysDept1.getDeptName());
signatureFlow.setStatus(0);
+ signatureFlow.setSort(signatureFlowReps.size()+1);
signatureFlowMapper.insert(signatureFlow);
return insert;
@@ -76,7 +89,7 @@
}
@Override
- public int deleteItem(Long[] ids) {
+ public int deleteItem(Integer ids) {
return signatureItemMapper.deleteItemByIds(ids);
}
}
--
Gitblit v1.9.2