From bc1a9e82418ec69bb5a14aa5d7f4b8c621112c29 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 19 Aug 2021 10:38:21 +0800
Subject: [PATCH] feat: There is no way the

---
 .../slrs/sarStandItems/entity/SarStandItems.java  |  4 ----
 .../service/impl/SarStandardsInfoServiceImpl.java | 15 +++++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java
index 4474b458..d9d268cb 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java
@@ -189,10 +189,6 @@ public class SarStandItems extends BaseEntity {
     @TableField("compliance_state")
     private String complianceState;
 
-    @ApiModelProperty(value = "符合性要求-符合性状态")
-    @TableId("COMPLIANCE_REQUIR")
-    private String complianceRequire;
-
     @ApiModelProperty(value = "解读内容")
     @TableField("read_content")
     private String readContent;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index fb043141..0b3baafc 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -267,13 +267,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      */
     public List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception {
         //查询当前登录人角色拥有权限的菜单
-        if(page.getMenuId() != null ){
+        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
             QueryWrapper<TsResource> qw = new QueryWrapper<>();
             qw.eq("ID",page.getMenuId());
             qw.isNull("PARENT_ID");
             List<TsResource> children = iTsResourceService.list(qw);
             if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
-                List<String> getMenuIdList = tsUserService.getResourceId(new TsResource());
+                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
                 if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
                     page.setMenuRoleList(getMenuIdList);
                 } else {
@@ -609,7 +609,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 List<SarStandItems> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
                 if(!sarItemVOS.isEmpty()){
                     Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
-                            .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getItemsName));
+                            .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getTermsConditions));
                     sarStandardsInfoEO.setMapItems(collectMap);
                 }
                 createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
@@ -1195,7 +1195,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             List<SarStandItems> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
             if(!sarItemVOS.isEmpty()){
                 Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
-                        .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getItemsName));
+                        .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getTermsConditions));
                 sarStandardsInfoEO.setMapItems(collectMap);
             }
             createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
@@ -1362,8 +1362,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             page = (SarStandardsInfoEOPage) JSONObject.toBean(jsonObject, SarStandardsInfoEOPage.class);
             page.setStandType(standardsInfoExcelVO.getStandType());
             //查询当前登录人角色拥有权限的菜单
-            List<String> getMenuIdList=tsUserService.getResourceId(new TsResource());
-//            List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
+            List<String> getMenuIdList = new ArrayList<>();
+            if(standardsInfoExcelVO.getUserId() != null){
+                getMenuIdList= tsUserService.getResourceUserId(standardsInfoExcelVO.getUserId());
+            }
+            //            List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
             if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
                 page.setMenuRoleList(getMenuIdList);
             } else {