From 23217bce7a08a6f3179863823b2847452cc606d7 Mon Sep 17 00:00:00 2001 From: "459816669@qq.com" <459816669@qq.com> Date: Sat, 27 Feb 2021 13:48:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=BF=9E=E6=8E=A5=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snow-admin/src/main/resources/application-druid.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snow-admin/src/main/resources/application-druid.yml b/snow-admin/src/main/resources/application-druid.yml index 33e163d..17a7d3b 100644 --- a/snow-admin/src/main/resources/application-druid.yml +++ b/snow-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://rm-bp1j1554xv1qs04295o.mysql.rds.aliyuncs.com:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: cloud_root - password: Jin!152377 + url: jdbc:mysql://127.0.0.1:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: root # 从库数据源 slave: # 从数据源开关/默认关闭 From ce58ff9dd72488653a4f2dfea248a3a218209076 Mon Sep 17 00:00:00 2001 From: "459816669@qq.com" <459816669@qq.com> Date: Sat, 27 Feb 2021 14:05:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B91.1=E7=89=88=E6=9C=ACbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/PurchaseOrderController.java | 12 ++++++++++++ .../web/controller/system/SysOaLeaveController.java | 6 ++++++ .../com/snow/system/domain/SysDingtalkSyncLog.java | 3 +++ 3 files changed, 21 insertions(+) diff --git a/snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java b/snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java index f9830c5..01181d7 100644 --- a/snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java +++ b/snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java @@ -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 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 list = purchaseOrderMainService.selectPurchaseOrderMainList(purchaseOrderMain); ExcelUtil util = new ExcelUtil(PurchaseOrderMain.class); return util.exportExcel(list, "purchaseOrder"); diff --git a/snow-admin/src/main/java/com/snow/web/controller/system/SysOaLeaveController.java b/snow-admin/src/main/java/com/snow/web/controller/system/SysOaLeaveController.java index 28e38a3..c98b15a 100644 --- a/snow-admin/src/main/java/com/snow/web/controller/system/SysOaLeaveController.java +++ b/snow-admin/src/main/java/com/snow/web/controller/system/SysOaLeaveController.java @@ -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 list = sysOaLeaveService.selectSysOaLeaveList(sysOaLeave); ExcelUtil util = new ExcelUtil(SysOaLeave.class); return util.exportExcel(list, "leave"); diff --git a/snow-system/src/main/java/com/snow/system/domain/SysDingtalkSyncLog.java b/snow-system/src/main/java/com/snow/system/domain/SysDingtalkSyncLog.java index 725d004..7a8ce5f 100644 --- a/snow-system/src/main/java/com/snow/system/domain/SysDingtalkSyncLog.java +++ b/snow-system/src/main/java/com/snow/system/domain/SysDingtalkSyncLog.java @@ -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;