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}