From 4b68ebacb89b6749ca598db033547d77a1c903f2 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 15 Apr 2019 15:08:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=A8=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E5=91=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/MallUserInfoController.java | 7 ++----- .../java/com/iformall/controller/WxTopicController.java | 1 + .../src/main/java/com/iformall/mapper/WxTopicMapper.java | 2 ++ .../java/com/iformall/service/impl/WxTopicServiceImpl.java | 3 +-- mallinkService/src/main/resources/mapper/WxTopicMapper.xml | 5 +++++ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java index 86f1819fb..d2509eb9a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java @@ -183,20 +183,17 @@ public class MallUserInfoController extends BaseController { if (currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode()) && currentUser.getId().equals(userInfo.getId())) { // 超管 - boolean bModify = false; MallUserInfo adminUser = new MallUserInfo(); adminUser.setFlowPermission(userInfo.getFlowPermission()); + adminUser.setEmail(userInfo.getEmail()); adminUser.setId(userInfo.getId()); if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { adminUser.setPassword(userInfo.getPassword()); - bModify = true; } if (StringUtils.isNotBlank(userInfo.getUsername())) { adminUser.setUsername(userInfo.getUsername()); } - if (bModify) { - userInfoService.saveOrUpdate(adminUser); - } + userInfoService.saveOrUpdate(adminUser); } else { userInfoService.saveOrUpdate(userInfo); if (userInfo.getRoleId() != null) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java index d684f3a1e..b0d424f53 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java @@ -54,6 +54,7 @@ public class WxTopicController extends BaseController { @PostMapping("saveOrUpdate") public ResultData saveOrUpdate(@RequestBody WxTopic wxTopic) { logger.debug("[" + getIpAddr() + "] WxTopicController::saveOrUpdate"); + wxTopic.setTenantId(super.getTenantId()); return wxTopicService.saveOrUpdate(wxTopic); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java index bdf0dd15f..66ffeb0b5 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java @@ -9,6 +9,8 @@ public interface WxTopicMapper extends CommonMapper { List findList(WxTopic wxTopic); + List findExist(WxTopic wxTopic); + WxTopic show(WxTopic record); void updateStatus(WxTopic record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index 4400d5d45..69261f0f1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -67,7 +67,6 @@ public class WxTopicServiceImpl implements WxTopicService { if(record.getStatus().equals(EnumWxTopicStatus.VAILD.getCode())) { WxTopic query = new WxTopic(); query.setTenantId(record.getTenantId()); - query.setStatus(EnumWxTopicStatus.VAILD.getCode()); if(record.getId() != null){ WxTopic wt = wxTopicMapper.selectByPrimaryKey(record.getId()); query.setBeginTime(wt.getBeginTime()); @@ -76,7 +75,7 @@ public class WxTopicServiceImpl implements WxTopicService { query.setBeginTime(record.getBeginTime()); query.setEndTime(record.getEndTime()); } - List topicList = wxTopicMapper.findList(record); + List topicList = wxTopicMapper.findExist(query); if (CollectionUtils.isNotEmpty(topicList)) { return new ResultData(ErrorCode.SYS_REPEAT_SUBMIT_EXCEPTION.getCode(), "["+topicList.get(0).getName()+"]正在活动中,截止至"+ DateUtils.date2String(topicList.get(0).getEndTime(),"yyyy-MM-dd")); } diff --git a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml index 3fde58d3c..7e9784552 100644 --- a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml @@ -57,6 +57,11 @@ + +