yfd
/
xxbs-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

首页统计

master
YIN 2026-03-18 15:49:57 +08:00
parent ededca0cff
commit 7f84d5bfe7
4 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -89,7 +89,7 @@
<id>prod</id> <id>prod</id>
<properties> <properties>
<profiles.active>prod</profiles.active> <profiles.active>prod</profiles.active>
<logging.level>warn</logging.level> <logging.level>info</logging.level>
<monitor.username>ruoyi</monitor.username> <monitor.username>ruoyi</monitor.username>
<monitor.password>123456</monitor.password> <monitor.password>123456</monitor.password>
<!-- 打包 prod 时自动跳过测试 --> <!-- 打包 prod 时自动跳过测试 -->

28
ruoyi-admin/src/main/java/org/dromara/web/controller/HomeController.java
View File

@ -46,31 +46,31 @@ public class HomeController {
public R<HashMap> index(PageQuery pageQuery) { public R<HashMap> index(PageQuery pageQuery) {
HashMap result = new HashMap(); HashMap result = new HashMap();
LoginUser user = LoginHelper.getLoginUser(); LoginUser user = LoginHelper.getLoginUser();
BizStatCateBo cateBo = new BizStatCateBo(); // BizStatCateBo cateBo = new BizStatCateBo();
Map<String, Object> params = cateBo.getParams(); // Map<String, Object> params = cateBo.getParams();
//
params.put("beginTime", ""); // params.put("beginTime", "");
params.put("endTime", ""); // params.put("endTime", "");
bizStatCateService.statByDate(cateBo); // bizStatCateService.statByDate(cateBo);
if (user.getRolePermission().contains("report_manager")){ // if (user.getRolePermission().contains("report_manager")){
BizReportInfoBo bo = new BizReportInfoBo(); BizReportInfoBo bo = new BizReportInfoBo();
bo.setOldType("dcl"); bo.setOldType("dcl");
bo.setOldTable("xxbs"); bo.setOldTable("xxbs");
result.put("dbxxbslist", bizReportInfoService.queryPageList(bo, pageQuery)); result.put("dbxxbslist", bizReportInfoService.queryPageList(bo, pageQuery));
}else{ // }else{
result.put("dbxxbslist", null); // result.put("dbxxbslist", null);
} // }
if (user.getRolePermission().contains("report_user")){ // if (user.getRolePermission().contains("report_user")){
BizReportInfoBo bo2 = new BizReportInfoBo(); BizReportInfoBo bo2 = new BizReportInfoBo();
bo2.setOldType("dcl"); bo2.setOldType("dcl");
bo2.setOldTable("xxcl"); bo2.setOldTable("xxcl");
result.put("dbxxcllist", bizReportInfoService.queryPageList(bo2, pageQuery)); result.put("dbxxcllist", bizReportInfoService.queryPageList(bo2, pageQuery));
}else{ // }else{
result.put("dbxxcllist", null); // result.put("dbxxcllist", null);
} // }
return R.ok(result); return R.ok(result);
} }

6
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
View File

@ -119,6 +119,12 @@ public class SysUserController extends BaseController {
shortName = shortName.equals("") ? deptName : shortName; shortName = shortName.equals("") ? deptName : shortName;
user.setDeptShortName(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)) { if (ObjectUtil.isNull(user)) {
return R.fail("没有权限访问用户数据!"); return R.fail("没有权限访问用户数据!");
} }

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
View File

@ -156,6 +156,10 @@ public class SysUserVo implements Serializable {
* 部门简称 * 部门简称
*/ */
private String deptShortName; private String deptShortName;
/**
* 工作部门简称
*/
private String workDeptShortName;
/** /**
* 显示顺序 * 显示顺序