From 03f55f9de1e5488980008f2c9c3d9765b98fcce2 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 10 Oct 2023 14:24:42 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=A0=87=E5=87=86=E4=BD=93=E7=B3=BB?=
 =?UTF-8?q?=E6=A0=91=E5=A2=9E=E5=88=A0=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarMenuStandardNewController.java          |  3 ++-
 .../service/ISarMenuStandardNewService.java    |  2 +-
 .../impl/SarMenuStandardNewServiceNewImpl.java | 18 +++++++++++++++---
 .../impl/SarMenuStandardServiceImpl.java       |  1 +
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java
index 9e95e0a1..95a63b1f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java
@@ -58,7 +58,8 @@ public class SarMenuStandardNewController extends BaseController<SarMenuStandard
         if (ObjectUtils.isEmpty(sarMenuStandardNew)) {
             return Result.error("添加失败，对象为空");
         }
-        return Result.success(iSarMenuStandardNewService.addMenuStandard(sarMenuStandardNew));
+        iSarMenuStandardNewService.addMenuStandard(sarMenuStandardNew);
+        return Result.success();
     }
 
     @ApiOperation("根据菜单ID查询菜单")
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java
index bb41985f..bbd48c1b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java
@@ -22,7 +22,7 @@ public interface ISarMenuStandardNewService extends IService<SarMenuStandardNew>
     String getTopMenu(SarMenuStandardNew sarMenuStandardNew);
 
 
-    Integer addMenuStandard(SarMenuStandardNew sarMenuStandardNew);
+    void addMenuStandard(SarMenuStandardNew sarMenuStandardNew);
 
     Integer updateMenuStandard(SarMenuStandardNew sarMenuStandardNew);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
index 7d1a640c..630b7970 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
@@ -3,8 +3,11 @@ package com.adc.da.slrs.sarMenuStandard.service.impl;
 import com.adc.da.slrs.sarMenuStandard.dao.SarMenuStandardNewDao;
 import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew;
 import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService;
+import com.adc.da.slrs.sarResource.dao.TsResourceDao;
+import com.adc.da.slrs.sarRole.dao.TsRoleDao;
 import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao;
 import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
+import com.adc.da.util.LoginUserUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,7 +34,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
     @Autowired
     private SarMenuStandardDao dao;
     @Resource
-    private SarMenuStandardNewDao menuStandardNewDao;
+    private TsRoleDao tsRoleDao;
+    @Resource
+    private TsResourceDao resourceDao;
 
 
     @Override
@@ -66,7 +71,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
     }
 
     @Override
-    public Integer addMenuStandard(SarMenuStandardNew sarMenuStandardNew) {
+    public void addMenuStandard(SarMenuStandardNew sarMenuStandardNew) {
         SarMenuStandard sarMenuStandard = new SarMenuStandard();
         BeanUtils.copyProperties(sarMenuStandardNew,sarMenuStandard);
         String parentId = sarMenuStandardNew.getParentId();
@@ -82,7 +87,14 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
         sarMenuStandard.setModifyTime(new Date());
         sarMenuStandard.setValidFlag(0);
         sarMenuStandard.setDicId("9m4qqqaansxmox5e82zm");
-        return dao.insert(sarMenuStandard);
+        dao.insert(sarMenuStandard);
+        List<String> roleIdList = tsRoleDao.getRoleByUserId(LoginUserUtil.getUserId());
+        for (String roleId : roleIdList) {
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("resourceId",sarMenuStandard.getId());
+            map.put("roleId",roleId);
+            resourceDao.insertTsRoleResource(map);
+        }
     }
 
     @Override
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java
index 29fa1c9d..39a59f7d 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java
@@ -110,6 +110,7 @@ public class SarMenuStandardServiceImpl extends ServiceImpl<SarMenuStandardDao,
     @Override
     public List<SarMenuStandard> getAll(String dicId) {
         QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>();
+        sarMenuQueryWrapper.eq("VALID_FLAG",0);
         sarMenuQueryWrapper.eq("DIC_ID",dicId);
         sarMenuQueryWrapper.orderByAsc("DISPLAY_SEQ");
 //        sarMenuQueryWrapper.isNull("PARENT_ID");