From 48d37836659d7dad1fb81b9b685aa9a04ff15284 Mon Sep 17 00:00:00 2001 From: songwenxuan <1924103812@qq.com> Date: Sat, 6 Jan 2024 18:01:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?pc=E7=AB=AF=E5=AF=B9=E6=8E=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/hiddenApi/impl/HiddenUserApiServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/zcloud/service/hiddenApi/impl/HiddenUserApiServiceImpl.java b/src/main/java/com/zcloud/service/hiddenApi/impl/HiddenUserApiServiceImpl.java index 4f1621af..85b6b297 100644 --- a/src/main/java/com/zcloud/service/hiddenApi/impl/HiddenUserApiServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenApi/impl/HiddenUserApiServiceImpl.java @@ -104,6 +104,10 @@ public class HiddenUserApiServiceImpl implements HiddenUserApiService { */ public PageData saveRectificationo(String findCreator , String hiddenId, String type, String loginUserId)throws Exception{ PageData pageData = new PageData(); + pageData.put("findCreator",findCreator); + pageData.put("hiddenId",hiddenId); + pageData.put("type",type); + pageData.put("loginUserId",loginUserId); if(!Tools.isEmpty(hiddenId)){ hiddenUserApiMapper.deleteByHidden(hiddenId); // 先删除后添加 } From 7e2b6b468df068863b5b5662d7b27e5fce05621e Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Sat, 6 Jan 2024 18:16:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B2=A7=E5=B7=9E=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=88=B0=E6=B8=AF=E5=8A=A1=E5=B1=80=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/keyProjects/PersonnelManagementController.java | 1 + .../controller/keyProjects/app/AppKeyProjectsController.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java index 896fea9f..df2838fd 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java @@ -75,6 +75,7 @@ public class PersonnelManagementController extends BaseController { String state = personnelmanagementService.IsJudgeCreator(getPageData().getString("PERSONNELMANAGEMENT_ID")); if ("1".equals(state)) { personnelmanagementService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); //返回结果 } else { errInfo = "fail"; map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java index cd435f83..918205a2 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.keyProjects.app; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -238,6 +240,7 @@ public class AppKeyProjectsController extends BaseController { */ @RequestMapping(value="/updateState") @ResponseBody + @DockAnnotation public Object updateState() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -245,6 +248,7 @@ public class AppKeyProjectsController extends BaseController { pd = this.getPageData(); outsourcedService.updateState(pd); //获取同时绑定的重点工程信息如果大于1表示还有其他重点工程 map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; }