From b46d2e46d065427584bd9c2e9dbf0dfff7f56965 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 27 Apr 2019 15:00:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:merge?= =?UTF-8?q?=E7=A7=AF=E5=88=86code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mem/WxCreditHistoryController.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index b8c0040ac..57d922127 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -52,9 +52,9 @@ public class WxCreditHistoryController extends BaseController @PostMapping("add") public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); -<<<<<<< HEAD - wxCreditHistory.setTenantId(getTenantId()); - wxCreditHistory.setOperatorId(getUser().getId()); + MallUserInfo user = getUser(); + wxCreditHistory.setTenantId(user.getTenantId()); + wxCreditHistory.setOperatorId(user.getId()); try { WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); return new ResultData(Result.SUCCESS, "操作成功", credit); @@ -62,13 +62,6 @@ public class WxCreditHistoryController extends BaseController logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); } -======= - MallUserInfo user = getUser(); - wxCreditHistory.setTenantId(user.getTenantId()); - wxCreditHistory.setOperatorId(user.getId()); - WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); - return new ResultData(Result.SUCCESS,"操作成功",credit); ->>>>>>> [getUser][修改]:重整 } @ApiOperation("根据id查询接口")