From 9cd93436c4096b5443cb3f651fbed40552ae0f55 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 26 Jul 2021 20:07:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=8E=EF=BC=8C=E5=9C=A8=E6=AD=A4=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E6=AD=A4=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/slrs/sarResource/dao/TsResourceDao.java |  3 +++
 .../service/impl/TsResourceServiceImpl.java    |  8 ++++++++
 .../SarStandAttrDetailsController.java         | 18 +++++++++---------
 .../mapper/sarResource/TsResourceMapper.xml    |  8 ++++++++
 .../da/att/controller/AttFileEOController.java |  8 ++++++--
 5 files changed, 34 insertions(+), 11 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 335a7986..de959ae0 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,6 +3,7 @@ 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;
 
 /**
@@ -19,4 +20,6 @@ public interface TsResourceDao extends BaseMapper<TsResource> {
 
     List<TsResource> selectMenuByRole(TsResource sarMenuEO);
 
+    int insertTsRoleResource(HashMap<String,Object> map);
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
index 3713fbf3..263a68e7 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
@@ -7,6 +7,7 @@ import com.adc.da.login.util.UserUtils;
 import com.adc.da.slrs.sarResource.dao.TsResourceDao;
 import com.adc.da.slrs.sarResource.entity.TsResource;
 import com.adc.da.slrs.sarResource.service.ITsResourceService;
+import com.adc.da.util.UUIDUtils;
 import com.adc.da.utils.treetool.Tree;
 import com.adc.da.utils.treetool.TreeNode;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -166,6 +168,12 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
             }
         }
         dao.insert(TsResource);
+        // 把新生成的子目录加入用户的权限的下----插入ts_role_resource表
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("resourceId",TsResource.getId());
+        map.put("roleId",1);
+        dao.insertTsRoleResource(map);
+
         return Result.success();
     }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java
index 5a6cb02a..2275753d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java
@@ -64,15 +64,15 @@ public class SarStandAttrDetailsController extends BaseController<SarStandAttrDe
 
         List<SarStandAttrDetails> getForeignStandList = InitStandAttrUtil.standForeignAttrFieldList;
         //新增字段
-        Iterator<SarStandAttrDetails> iterator = getInlandStandList.iterator();
-        while (iterator.hasNext()){
-            SarStandAttrDetails next = iterator.next();
-
-            if (next.getAttrName().matches("能源类型|适用产品线|适用认证|责任工程师|关联文件")){
-                getForeignStandList.add(next);
-            }
-
-        }
+//        Iterator<SarStandAttrDetails> iterator = getInlandStandList.iterator();
+//        while (iterator.hasNext()){
+//            SarStandAttrDetails next = iterator.next();
+//
+//            if (next.getAttrName().matches("能源类型|适用产品线|适用认证|责任工程师|关联文件")){
+//                getForeignStandList.add(next);
+//            }
+//
+//        }
         resultMap.put(SarTypeEnum.FOREIGN_STAND.getValue(),getForeignStandList);
 
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml
index a09cbd84..09f9859f 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml
@@ -15,6 +15,8 @@
         <result column="remarks" property="remarks" />
     </resultMap>
 
+
+
     <!-- SAR_MENU table all fields -->
     <sql id="Base_Column_List" >
      parent_id, menu_name, sor_divide, id, modify_time, creation_time, valid_flag, display_seq, parent_ids, remarks
@@ -69,6 +71,12 @@
         </trim>
     </sql>
 
+
+    <insert id="insertTsRoleResource" parameterType="java.util.Map">
+        INSERT INTO ts_role_resource
+        VALUES(#{roleId},#{resourceId} )
+    </insert>
+
     <!-- 插入记录 -->
     <insert id="insert" parameterType="com.adc.da.slrs.sarResource.entity.TsResource" >
         <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
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 cc34cb29..c5cc4baa 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
@@ -273,15 +273,19 @@ public class AttFileEOController {
             String waterFilePath = newFilePath + attFileEO.getOldFileName();
             // 添加水印
             String userMsg = "";
+            String date="";
             TsUser tsUser = userDao.selectById(userId);
             if (tsUser != null) {
                 userMsg = tsUser.getUname() + ",";
                 if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
                     userMsg += tsUser.getWorkNum() + ",";
                 }
+            }else {
+                //没有用户信息时
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
+                 date = df.format(new Date());
             }
-            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
-            String date = df.format(new Date());
+
             String waterContent = userMsg + date;
             //2020年9月5日  去掉水印处理
             //2021年7月25日要求下载生成水印