From 1bb748baa8229a272a9bc345ce8d98f85fbd8a1e Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 7 Jun 2021 18:01:25 +0800 Subject: [PATCH] tt --- .../main/java/com/iformall/service/impl/WxMallServiceImpl.java | 1 + .../java/com/iformall/controller/basic/WxMallController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 5e46c5f61..815453df1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -327,6 +327,7 @@ public class WxMallServiceImpl implements WxMallService { if(oldUser == null){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"找不到管理员"); } + userInfo.setUsername(oldUser.getUsername()); if(!oldUser.getTenantId().equals(userInfo.getTenantId())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"tenant_id不匹配"); } diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java index 1590f95cb..d5e63302b 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java @@ -89,7 +89,7 @@ public class WxMallController extends BaseController { if(wxMall.getAdminId() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"admin_id不能为空"); } - wxMall.setAdminUsername(null); +// wxMall.setAdminUsername(null); } return wxMallService.addAadmin(wxMall);