From 1ce0e61aba99fbd104e6a8864d299741fea46eb1 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Sun, 4 Jun 2023 14:15:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=BB=E5=9B=BE=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/controller/ActModelController.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java index a537318b5..512ad58b5 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java @@ -10,6 +10,7 @@ import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.workflow.domain.bo.ModelBo; import org.dromara.workflow.domain.vo.AccountVo; @@ -21,6 +22,8 @@ import org.springframework.util.MultiValueMap; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Objects; + /** * 模型管理 控制层 * @@ -48,12 +51,11 @@ public class ActModelController extends BaseController { */ @GetMapping("/rest/account") public String getAccount() { - AccountVo accountVo = new AccountVo(); - accountVo.setId("admin"); + accountVo.setId(Objects.requireNonNull(LoginHelper.getUserId()).toString()); accountVo.setFirstName(""); - accountVo.setLastName("admin"); - accountVo.setFullName("admin"); + accountVo.setLastName(LoginHelper.getUsername()); + accountVo.setFullName(LoginHelper.getUsername()); return JsonUtils.toJsonString(accountVo); } @@ -88,7 +90,7 @@ public class ActModelController extends BaseController { @Log(title = "模型管理", businessType = BusinessType.UPDATE) @PostMapping(value = "/rest/models/{modelId}/editor/json") public R editModel(@PathVariable String modelId, @RequestParam MultiValueMap values) { - return toAjax(iActModelService.editModel(modelId,values)); + return toAjax(iActModelService.editModel(modelId, values)); } /**