2024-05-29 更新

src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java

@@ -785,7 +785,6 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
 
         // 3.2 获取mainData
         List<MainData> mainData = new ArrayList<>();
-        mainData.add(new MainData("csenginner", "3"));
         List<PlmRequestDetailVo> nodeDetails = changeManagementMapper.queryNodeDetailFirst(data.getSite(), workflowId, data.getMenuId());
 
         // 查出变更单相关表的数据

src/main/java/com/spring/modules/sys/controller/SysLoginController.java

@@ -102,11 +102,11 @@ public class SysLoginController extends AbstractController {
 	 */
 	@PostMapping("/sys/loginToken")
 	public Map<String, Object> 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;

src/main/resources/mapper/change/ChangeManagementMapper.xml

@@ -912,7 +912,7 @@
         update ${tableName}
         set step_id = #{stepId}
         <if test='rejectFlag == "Y"'>
-            reject_flag = 'Y',
+             ,reject_flag = 'Y'
         </if>
         where site = #{site} and ${fieldName1} = #{docNo}
     </update>