保养标准导入

“linengliang”

2023-12-04 12bfd8a94f5b5afe8c149e8de7e275a81a4bf77e

 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());