From 707b5af9ed7c12d18cba597e3f2f76671891034b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 12 十二月 2023 17:27:21 +0800
Subject: [PATCH] 技术状态鉴定 批量点检驳回 审批
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
index 3eb1834..f97ca3c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.jeecg.dingtalk.api.user.vo.User;
import com.jeecg.dingtalk.api.user.vo.UserRole;
import org.jeecg.common.api.dto.message.MessageDTO;
@@ -112,9 +113,14 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = userService.getById(user.getId());
+ if(StringUtils.isNotBlank(sysUser.getAreaId())){
+ stream.setAreaId(sysUser.getAreaId());
+ }
QueryWrapper<Stream> queryWrapper = QueryGenerator.initQueryWrapper(stream, req.getParameterMap());
Page<Stream> page = new Page<Stream>(pageNo, pageSize);
- IPage<Stream> pageList = streamService.page(page, queryWrapper);
+ IPage<Stream> pageList = streamService.myPage(page, stream);
return Result.OK(pageList);
}
@@ -535,11 +541,12 @@
for(SysDictItem nodeOperationItem:nodeOperationItems){
if(roleNodeItem.getItemValue().equals(nodeOperationItem.getItemValue())){
if(ObjectUtils.isNotNull(operation)){
- List<String> buttonvalues = Arrays.asList(nodeOperationItem.getItemText().split(","));
+ List<String> buttonValues = Arrays.asList(nodeOperationItem.getItemText().split(","));
List<SysDictItem> operations = sysDictItemService.selectItemsByMainId(operation.getId());
List<ButtonVo> buttons = new ArrayList<>();
- for(String value:buttonvalues){
+ for(String value:buttonValues){
for(SysDictItem name:operations){
+
if(name.getItemValue().equals(value)){
ButtonVo button = new ButtonVo();
button.setName(name.getItemText());
--
Gitblit v1.9.3