From 0a9b6e565843bd25e5ef37e979c7da9bbf3df218 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 四月 2022 17:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-user/src/main/java/com/java110/user/cmd/menuUser/SaveMenuUserCmd.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/menuUser/SaveMenuUserCmd.java b/service-user/src/main/java/com/java110/user/cmd/menuUser/SaveMenuUserCmd.java
index 0fe691b..4a31c5e 100644
--- a/service-user/src/main/java/com/java110/user/cmd/menuUser/SaveMenuUserCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/menuUser/SaveMenuUserCmd.java
@@ -22,6 +22,8 @@
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.menu.MenuDto;
+import com.java110.intf.community.IMenuInnerServiceSMO;
 import com.java110.intf.user.IMenuUserV1InnerServiceSMO;
 import com.java110.po.menuUser.MenuUserPo;
 import com.java110.utils.exception.CmdException;
@@ -31,6 +33,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
 
 /**
  * 绫昏〃杩帮細淇濆瓨
@@ -52,13 +56,14 @@
     @Autowired
     private IMenuUserV1InnerServiceSMO menuUserV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "mId", "璇锋眰鎶ユ枃涓湭鍖呭惈mId");
-        Assert.hasKeyAndValue(reqJson, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈staffId");
-        Assert.hasKeyAndValue(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
+        Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈userId");
         Assert.hasKeyAndValue(reqJson, "icon", "璇锋眰鎶ユ枃涓湭鍖呭惈icon");
-        Assert.hasKeyAndValue(reqJson, "url", "璇锋眰鎶ユ枃涓湭鍖呭惈url");
         Assert.hasKeyAndValue(reqJson, "seq", "璇锋眰鎶ユ枃涓湭鍖呭惈seq");
 
     }
@@ -69,6 +74,19 @@
 
         MenuUserPo menuUserPo = BeanConvertUtil.covertBean(reqJson, MenuUserPo.class);
         menuUserPo.setMuId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+
+        //
+        MenuDto menuDto = new MenuDto();
+        menuDto.setmId(reqJson.getString("mId"));
+        List<MenuDto> menuDtos = menuInnerServiceSMOImpl.queryMenus(menuDto);
+
+        Assert.listOnlyOne(menuDtos, "鑿滃崟涓嶅瓨鍦�");
+
+        menuUserPo.setmId(menuDtos.get(0).getmId());
+        menuUserPo.setUrl(menuDtos.get(0).getUrl());
+        menuUserPo.setName(menuDtos.get(0).getName());
+        menuUserPo.setStaffId(reqJson.getString("userId"));
+
         int flag = menuUserV1InnerServiceSMOImpl.saveMenuUser(menuUserPo);
 
         if (flag < 1) {

--
Gitblit v1.8.0