OpenGitLink
/
snow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/develop1.2' 

# Conflicts:
#	snow-admin/src/main/resources/application-druid.yml
This commit is contained in:
459816669@qq.com 2021-02-27 14:08:38 +08:00
parent 0779f311e0 ce58ff9dd7
commit 61aa610749
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java
View File

@ -85,6 +85,12 @@ public class PurchaseOrderController extends BaseController
public TableDataInfo list(PurchaseOrderMain purchaseOrderMain)
{
startPage();
SysUser sysUser = ShiroUtils.getSysUser();
purchaseOrderMain.setCreateBy(sysUser.getUserName());
//管理员权限判断
if(!ShiroUtils.getSysUser().isAdmin()){
purchaseOrderMain.setCreateBy(String.valueOf(sysUser.getUserId()));
}
List<PurchaseOrderMain> list = purchaseOrderMainService.selectPurchaseOrderMainList(purchaseOrderMain);
return getDataTable(list);
}
@ -98,6 +104,12 @@ public class PurchaseOrderController extends BaseController
@ResponseBody
public AjaxResult export(PurchaseOrderMain purchaseOrderMain)
{
SysUser sysUser = ShiroUtils.getSysUser();
purchaseOrderMain.setCreateBy(sysUser.getUserName());
//管理员权限判断
if(!ShiroUtils.getSysUser().isAdmin()){
purchaseOrderMain.setCreateBy(String.valueOf(sysUser.getUserId()));
}
List<PurchaseOrderMain> list = purchaseOrderMainService.selectPurchaseOrderMainList(purchaseOrderMain);
ExcelUtil<PurchaseOrderMain> util = new ExcelUtil<PurchaseOrderMain>(PurchaseOrderMain.class);
return util.exportExcel(list, "purchaseOrder");

6
snow-admin/src/main/java/com/snow/web/controller/system/SysOaLeaveController.java
View File

@ -100,6 +100,12 @@ public class SysOaLeaveController extends BaseController
@ResponseBody
public AjaxResult export(SysOaLeave sysOaLeave)
{
SysUser sysUser = ShiroUtils.getSysUser();
sysOaLeave.setCreateBy(sysUser.getUserName());
//管理员权限判断
if(!ShiroUtils.getSysUser().isAdmin()){
sysOaLeave.setCreateBy(String.valueOf(sysUser.getUserId()));
}
List<SysOaLeave> list = sysOaLeaveService.selectSysOaLeaveList(sysOaLeave);
ExcelUtil<SysOaLeave> util = new ExcelUtil<SysOaLeave>(SysOaLeave.class);
return util.exportExcel(list, "leave");

1
snow-admin/src/main/resources/application-druid.yml
View File

@ -31,7 +31,6 @@ spring:
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false

3
snow-system/src/main/java/com/snow/system/domain/SysDingtalkSyncLog.java
View File

@ -1,6 +1,8 @@
package com.snow.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.snow.common.annotation.Excel;
import com.snow.common.core.domain.BaseEntity;
import com.snow.common.enums.DingTalkListenerType;
@ -92,6 +94,7 @@ public class SysDingtalkSyncLog extends BaseEntity
/** 操作时间 */
@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date operTime;
private DingTalkListenerType dingTalkListenerType;