From df079b2796e8c227f32fdc81da6f6bbf2e529ed8 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Wed, 25 Sep 2024 19:10:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9=E6=A0=B9?=
=?UTF-8?q?=E6=8D=AE=E9=83=A8=E9=97=A8=E8=8E=B7=E5=8F=96=E5=88=86=E7=AE=A1?=
=?UTF-8?q?=E9=A2=86=E5=AF=BC=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E5=80=BC=E5=89=AF=E6=89=80=E9=95=BF=202.=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E7=BB=93=E9=A1=B9=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98?=
=?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=89=80=E6=9C=89=203.=E5=AD=A3=E5=BA=A6?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98?=
=?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=204.=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=91=A8=E6=8A=A5=E4=BF=AE=E6=94=B9=E6=8A=A5?=
=?UTF-8?q?=E9=94=99=E7=9A=84bug=205.=E4=B8=AA=E4=BA=BA=E5=91=A8=E6=8A=A5?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2user=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6user!=3D0(=E7=AE=A1=E7=90=86=E5=91=98)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/xqopen/kehui/flows/util/MyTaskListener.java | 1 +
.../java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml | 3 ++-
.../xqopen/kehui/project/action/ProjectInitComtroller.java | 5 +++--
.../project/action/ProjectQuarterlyEvaluationController.java | 5 ++++-
.../xqopen/kehui/project/action/ProjectWeeklyController.java | 2 +-
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java b/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java
index 499051c..9695d8e 100644
--- a/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java
+++ b/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java
@@ -558,6 +558,7 @@ public class MyTaskListener implements TaskListener {
case "办公室":
case "人财中心":
case "财务中心":
+ default:
return "depDirector";
}
}
diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
index 07c02c5..73c57c2 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
@@ -32,9 +32,10 @@
and pw.is_deleted=#{projectWeekly.isDeleted}
-
+
and pw.user_id=#{projectWeekly.userId}
+
and pw.id_=#{projectWeekly.id}
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
index d2baabb..673fb41 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
@@ -1,6 +1,5 @@
package com.xqopen.kehui.project.action;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.support.spring.FastJsonJsonView;
@@ -536,7 +535,9 @@ public class ProjectInitComtroller implements ProjectInitApi {
try {
Page page = new Page<>(pageNoUtil.getPageNo(), pageNoUtil.getPageSize());
Map map = pageNoUtil.getMap();
- map.put("userId", userId);
+ if(!"0".equals(userId.toString())){
+ map.put("userId", userId);
+ }
List list = infoService.conclusionList(page, map);
return ApiResponse.fillSuccess(new ResultListReqUtil(list, page.getTotal(), page.getPages()));
} catch (Exception e) {
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java
index b083088..f38e82f 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java
@@ -43,7 +43,10 @@ public class ProjectQuarterlyEvaluationController implements ProjectQuarterlyEva
if (!ObjectUtils.isEmpty(pageNoUtil)) {
//先拿到季度审核表数据
EntityWrapper userLoginEntityWrapper = new EntityWrapper<>();
- userLoginEntityWrapper.eq("id_", userId);
+ //管理员查看所有
+ if(!"0".equals(userId.toString())){
+ userLoginEntityWrapper.eq("id_", userId);
+ }
SystemUserLogin systemUserLogin = userLoginService.selectOne(userLoginEntityWrapper);
EntityWrapper evaluationEntityWrapper = new EntityWrapper<>();
evaluationEntityWrapper.eq("is_deleted", "0");
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
index 64461cc..0098563 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
@@ -163,7 +163,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
JSONArray projectAdmin = extInfo.getJSONArray("projectAdmin");
// 将projectAdmin改为人事id
EntityWrapper userLoginEntityWrapper = new EntityWrapper<>();
- userLoginEntityWrapper.eq("id_", projectAdmin.getString(projectAdmin.toArray().length -1 ));
+ userLoginEntityWrapper.eq("id_", Long.parseLong(projectAdmin.getString(projectAdmin.toArray().length -1 )));
SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
ext.put("projectManagerData",projectManagerData.getString(projectManagerData.toArray().length -1 ));