From 7f84d5bfe723d650079c7499c062d157de9fc572 Mon Sep 17 00:00:00 2001
From: YIN <yinfeida@qq.com>
Date: Wed, 18 Mar 2026 15:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../web/controller/HomeController.java        | 28 +++++++++----------
 .../controller/system/SysUserController.java  |  6 ++++
 .../dromara/system/domain/vo/SysUserVo.java   |  4 +++
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 376f4f9..b090e1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
             <id>prod</id>
             <properties>
                 <profiles.active>prod</profiles.active>
-                <logging.level>warn</logging.level>
+                <logging.level>info</logging.level>
                 <monitor.username>ruoyi</monitor.username>
                 <monitor.password>123456</monitor.password>
                 <!-- 打包 prod 时自动跳过测试 -->
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/HomeController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/HomeController.java
index 3da0bd4..70495b6 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/HomeController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/HomeController.java
@@ -46,31 +46,31 @@ public class HomeController {
     public R<HashMap> index(PageQuery pageQuery) {
         HashMap result = new HashMap();
         LoginUser user = LoginHelper.getLoginUser();
-        BizStatCateBo cateBo = new BizStatCateBo();
-        Map<String, Object> params = cateBo.getParams();
-
-        params.put("beginTime", "");
-        params.put("endTime", "");
-        bizStatCateService.statByDate(cateBo);
+//        BizStatCateBo cateBo = new BizStatCateBo();
+//        Map<String, Object> params = cateBo.getParams();
+//
+//        params.put("beginTime", "");
+//        params.put("endTime", "");
+//        bizStatCateService.statByDate(cateBo);
 
 
-        if (user.getRolePermission().contains("report_manager")){
+//        if (user.getRolePermission().contains("report_manager")){
             BizReportInfoBo bo = new BizReportInfoBo();
             bo.setOldType("dcl");
             bo.setOldTable("xxbs");
             result.put("dbxxbslist", bizReportInfoService.queryPageList(bo, pageQuery));
-        }else{
-            result.put("dbxxbslist", null);
-        }
+//        }else{
+//            result.put("dbxxbslist", null);
+//        }
 
-        if (user.getRolePermission().contains("report_user")){
+//        if (user.getRolePermission().contains("report_user")){
             BizReportInfoBo bo2 = new BizReportInfoBo();
             bo2.setOldType("dcl");
             bo2.setOldTable("xxcl");
             result.put("dbxxcllist", bizReportInfoService.queryPageList(bo2, pageQuery));
-        }else{
-            result.put("dbxxcllist", null);
-        }
+//        }else{
+//            result.put("dbxxcllist", null);
+//        }
 
         return R.ok(result);
     }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
index c62e7f8..5c20535 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
@@ -119,6 +119,12 @@ public class SysUserController extends BaseController {
         shortName = shortName.equals("") ? deptName : shortName;
         user.setDeptShortName(shortName);
 
+        SysDeptVo wdept = deptService.selectDeptById(user.getWorkDeptId());
+        String wshortName = Helper.NStr(wdept.getShortName());
+        String wdeptName = Helper.NStr(wdept.getDeptName());
+        wshortName = wshortName.equals("") ? wdeptName : wshortName;
+        user.setDeptShortName(wshortName);
+
         if (ObjectUtil.isNull(user)) {
             return R.fail("没有权限访问用户数据!");
         }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
index 1202594..3bc4030 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
@@ -156,6 +156,10 @@ public class SysUserVo implements Serializable {
      * 部门简称
      */
     private String deptShortName;
+    /**
+     * 工作部门简称
+     */
+    private String workDeptShortName;
 
     /**
      * 显示顺序