From d7a2285d752a29252c83b98284879a8007a0c90f Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 30 Jul 2021 16:26:27 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=9C=80=E6=96=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9f82519e --- .../com/adc/da/slrs/sarResource/dao/TsResourceDao.java | 3 --- .../com/adc/da/att/controller/AttFileEOController.java | 9 ++++----- .../da/person/controller/PersonCollectEOController.java | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java index de959ae0..335a7986 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java @@ -3,7 +3,6 @@ package com.adc.da.slrs.sarResource.dao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.HashMap; import java.util.List; /** @@ -20,6 +19,4 @@ public interface TsResourceDao extends BaseMapper { List selectMenuByRole(TsResource sarMenuEO); - int insertTsRoleResource(HashMap map); - } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index ef5fb044..cc34cb29 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -276,14 +276,13 @@ public class AttFileEOController { TsUser tsUser = userDao.selectById(userId); if (tsUser != null) { userMsg = tsUser.getUname() + ","; - //2021/7/28水印内容取消工号 -// if (StringUtils.isNotEmpty(tsUser.getWorkNum())) { -// userMsg += tsUser.getWorkNum() + ","; -// } + if (StringUtils.isNotEmpty(tsUser.getWorkNum())) { + userMsg += tsUser.getWorkNum() + ","; + } } SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 String date = df.format(new Date()); - String waterContent = userMsg+date ; + String waterContent = userMsg + date; //2020年9月5日 去掉水印处理 //2021年7月25日要求下载生成水印 WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent); diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java index 600d4d9b..5ffdf75d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java @@ -93,7 +93,7 @@ public class PersonCollectEOController extends BaseController { @ApiOperation(value = "|PersonCollectEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE,value = "/updatePersonCollect") // @RequiresPermissions("person:personCollect:update") public ResponseMessage update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { tsPersonCollect.setModifyTime(new Date());