From 4afd150e18b0c0755977a8c1512c4074e5e3f619 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 29 May 2024 08:57:59 +0800 Subject: [PATCH] =?UTF-8?q?2024-05-29=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChangeManagementServiceImpl.java | 1 - .../modules/sys/controller/SysLoginController.java | 10 +++++----- .../resources/mapper/change/ChangeManagementMapper.xml | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index d9dc7d00..16c75466 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -785,7 +785,6 @@ public class ChangeManagementServiceImpl extends ServiceImpl mainData = new ArrayList<>(); - mainData.add(new MainData("csenginner", "3")); List nodeDetails = changeManagementMapper.queryNodeDetailFirst(data.getSite(), workflowId, data.getMenuId()); // 查出变更单相关表的数据 diff --git a/src/main/java/com/spring/modules/sys/controller/SysLoginController.java b/src/main/java/com/spring/modules/sys/controller/SysLoginController.java index 6f73368a..cf858a98 100644 --- a/src/main/java/com/spring/modules/sys/controller/SysLoginController.java +++ b/src/main/java/com/spring/modules/sys/controller/SysLoginController.java @@ -102,11 +102,11 @@ public class SysLoginController extends AbstractController { */ @PostMapping("/sys/loginToken") public Map loginToken(@RequestBody SysLoginForm form , HttpServletRequest request) throws Exception { - // 根据token解析出域控账号，对比和操作人是否一致 - String decrypt = AESUtil.decrypt(form.getToken()); - if (!form.getDomainControlAccount().equals(decrypt)) { - return R.error("操作人有误！"); - } +// // 根据token解析出域控账号，对比和操作人是否一致 +// String decrypt = AESUtil.decrypt(form.getToken()); +// if (!form.getDomainControlAccount().equals(decrypt)) { +// return R.error("操作人有误！"); +// } //生成token，并保存到数据库 R r = sysUserTokenService.createToken2(form); return r; diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index de7309fb..a1906b8c 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml @@ -912,7 +912,7 @@ update ${tableName} set step_id = #{stepId} - reject_flag = 'Y', + ,reject_flag = 'Y' where site = #{site} and ${fieldName1} = #{docNo}