Merge remote-tracking branch 'gitea/dev' into dev

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java

@@ -2,7 +2,6 @@ package org.dromara.bigscreen.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import jakarta.annotation.Resource;
@@ -28,6 +27,7 @@ import org.dromara.bigscreen.domain.vo.MyProjectInfoVo;
 import org.dromara.bigscreen.service.IBusBwlService;
 import org.dromara.bigscreen.service.IBusSygjService;
 import org.dromara.bigscreen.service.IBusWjzxService;
+import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.domain.dto.UserDTO;
 import org.dromara.common.core.enums.BusinessStatusEnum;
@@ -42,7 +42,9 @@ import org.dromara.common.web.core.BaseController;
 import org.dromara.patch.domain.bo.PdMasterBo;
 import org.dromara.patch.domain.vo.PdMasterBymiAndQt;
 import org.dromara.patch.service.IPdMasterService;
-import org.dromara.system.service.impl.SysDeptServiceImpl;
+import org.dromara.system.domain.SysMenu;
+import org.dromara.system.mapper.SysRoleMapper;
+import org.dromara.system.service.impl.SysMenuServiceImpl;
 import org.dromara.system.service.impl.SysUserServiceImpl;
 import org.dromara.warm.flow.core.FlowEngine;
 import org.dromara.warm.flow.core.entity.User;
@@ -92,9 +94,9 @@ public class PersonalHomeController extends BaseController {
 
     @Resource
     private IAIChatMemoryService aiChatMemoryService;
-    @Autowired
-    private SysDeptServiceImpl sysDeptService;
 
+    private final SysRoleMapper roleMapper;
+    private final SysMenuServiceImpl menuMapper;
 
     // region AI 模块
 
@@ -306,8 +308,9 @@ public class PersonalHomeController extends BaseController {
      * 获取部门树
      */
     @GetMapping("/deptTree")
-    public R<List<Tree<Long>>> deptTree() {
+    public R<List<SysMenu>> deptTree() {
-        return R.ok(sysDeptService.buildDeptTree());
+//        SysRole role = roleMapper.selectById(1);
+        return R.ok(menuMapper.selectMenuTreeByUserId(SystemConstants.SUPER_ADMIN_ID, null));
     }
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/SysRoleWorkVo.java

@@ -36,6 +36,11 @@ public class SysRoleWorkVo implements Serializable {
     @ExcelProperty(value = "绑定角色ID")
     private Long roleId;
 
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
     /**
      * 流程名称
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/SysRoleWorkServiceImpl.java

@@ -14,8 +14,12 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.vo.SysRoleVo;
+import org.dromara.system.service.impl.SysRoleServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +35,8 @@ import java.util.Map;
 public class SysRoleWorkServiceImpl extends ServiceImpl<SysRoleWorkMapper, SysRoleWork> implements ISysRoleWorkService {
 
     private final SysRoleWorkMapper baseMapper;
+    @Autowired
+    private SysRoleServiceImpl roleService;
 
     /**
      * 查询角色流程对应
@@ -40,7 +46,13 @@ public class SysRoleWorkServiceImpl extends ServiceImpl<SysRoleWorkMapper, SysRo
      */
     @Override
     public SysRoleWorkVo queryById(Long id){
-        return baseMapper.selectVoById(id);
+        SysRoleWorkVo sysRoleWorkVo = baseMapper.selectVoById(id);
+        List<SysRoleWorkVo> sysRoleWorkVo1 = new ArrayList<>();
+        if (sysRoleWorkVo != null) {
+            sysRoleWorkVo1 = List.of(sysRoleWorkVo);
+            setValue(sysRoleWorkVo1);
+        }
+        return sysRoleWorkVo1.getFirst();
     }
 
     /**
@@ -54,6 +66,7 @@ public class SysRoleWorkServiceImpl extends ServiceImpl<SysRoleWorkMapper, SysRo
     public TableDataInfo<SysRoleWorkVo> queryPageList(SysRoleWorkBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<SysRoleWork> lqw = buildQueryWrapper(bo);
         Page<SysRoleWorkVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        setValue(result.getRecords());
         return TableDataInfo.build(result);
     }
 
@@ -137,4 +150,16 @@ public class SysRoleWorkServiceImpl extends ServiceImpl<SysRoleWorkMapper, SysRo
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    public void setValue(List<SysRoleWorkVo> vos){
+        for (SysRoleWorkVo vo : vos) {
+            if (vo.getRoleId() != null){
+                SysRoleVo sysRoleVo = roleService.selectRoleById(vo.getRoleId());
+                if (sysRoleVo != null){
+                    vo.setRoleName(sysRoleVo.getRoleName());
+                }
+            }
+        }
+    }
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java

@@ -32,10 +32,7 @@ import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 承包合同竣工结算Service业务层处理
@@ -73,8 +70,11 @@ public class XzdContractAccountServiceImpl extends ServiceImpl<XzdContractAccoun
     @Override
     public XzdContractAccountVo queryById(Long id){
         XzdContractAccountVo xzdContractAccountVo = baseMapper.selectVoById(id);
-        List<XzdContractAccountVo> xzdContractAccountVo1 = List.of(xzdContractAccountVo);
+        List<XzdContractAccountVo> xzdContractAccountVo1 = new ArrayList<>();
-        setValue(xzdContractAccountVo1);
+        if(xzdContractAccountVo != null) {
+            xzdContractAccountVo1 = List.of(xzdContractAccountVo);
+            setValue(xzdContractAccountVo1);
+        }
         return xzdContractAccountVo1.getFirst();
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml

@@ -17,6 +17,7 @@
         supplement.creator as createByUser,
         info.create_time as createTime,
         info.update_time as updateTime,
+        info.remarks as remarks,
         supplement.responsible_department as fgbm,
         supplement.responsible_salesman as fgywy,
         supplement.supplier_status as gyszt,