From c490640493f04e2ed0fc5c4c8fbc92ebdd4d5380 Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Tue, 24 Jun 2025 21:06:48 +0800
Subject: [PATCH] Merge branch 'gzdyh_prod'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 76 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 6 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
index 74ebc7c..b41d9ab 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
@@ -525,6 +525,13 @@
terms.put("partyName", partyName);
}
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
+ //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
+ if (201 == unitById.getUnitType()) {
+ CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
+ if (bjZzzx != null)
+ loginUser.setUnitId(bjZzzx.getId());
+ }
if (status == 1) {
terms.put("candeUnitId", loginUser.getUnitId());
} else {
@@ -615,6 +622,13 @@
terms.put("partyName", partyName);
}
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
+ //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
+ if (201 == unitById.getUnitType()) {
+ CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
+ if (bjZzzx != null)
+ loginUser.setUnitId(bjZzzx.getId());
+ }
if (status == 1) {
terms.put("candeUnitId", loginUser.getUnitId());
} else {
@@ -763,6 +777,13 @@
}
setRequestParam(terms);
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
+ //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
+ if (201 == unitById.getUnitType()) {
+ CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
+ if (bjZzzx != null)
+ loginUser.setUnitId(bjZzzx.getId());
+ }
// 不予受理，查询case_dismiss表
if (status == 3) {
terms.put("disUnitId", loginUser.getUnitId());
@@ -813,10 +834,17 @@
}
terms.put("caseTaskType", caseTaskType);
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
+ //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
+ if (201 == unitById.getUnitType()) {
+ CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
+ if (bjZzzx != null)
+ loginUser.setUnitId(bjZzzx.getId());
+ }
terms.put("candeUnitId", loginUser.getUnitId());
String mediatorType = request.getParameter("mediatorType");
- if(ObjectUtils.isNotEmpty(mediatorType)){
+ if (ObjectUtils.isNotEmpty(mediatorType)) {
terms.put("mediatorType", mediatorType);
terms.put("mediatorId", loginUser.getId());
}
@@ -894,6 +922,13 @@
terms.put("partyName", partyName);
}
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
+ //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
+ if (201 == unitById.getUnitType()) {
+ CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
+ if (bjZzzx != null)
+ loginUser.setUnitId(bjZzzx.getId());
+ }
if (caseTaskType == 1) {
terms.put("applyUnitId", loginUser.getUnitId());
} else {
@@ -1043,6 +1078,13 @@
}
PageRequest pageRequest = PageRequest.of(page - 1, size, sort);
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
+ //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
+ if (201 == unitById.getUnitType()) {
+ CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
+ if (bjZzzx != null)
+ loginUser.setUnitId(bjZzzx.getId());
+ }
terms.put("auditUnitId", loginUser.getUnitId());
terms.put("applyStatus", status);
return ReturnSucUtils.getRepInfo(service.pageMyTaskSh(pageRequest, type, terms));
@@ -1121,6 +1163,13 @@
}
PageRequest pageRequest = PageRequest.of(page - 1, size, sort);
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
+ //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
+ if (201 == unitById.getUnitType()) {
+ CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
+ if (bjZzzx != null)
+ loginUser.setUnitId(bjZzzx.getId());
+ }
terms.put("applyUnitId", loginUser.getUnitId());
return ReturnSucUtils.getRepInfo(service.pageMyTaskShWSQD(pageRequest, terms));
} catch (Exception e) {
@@ -1196,6 +1245,13 @@
}
PageRequest pageRequest = PageRequest.of(page - 1, size, sort);
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
+ //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
+ if (201 == unitById.getUnitType()) {
+ CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
+ if (bjZzzx != null)
+ loginUser.setUnitId(bjZzzx.getId());
+ }
Page<FrontPageListDTO> frontPageListDTOPage = null;
if (StringUtils.isNotBlank(loginUser.getUnitId())) {
terms.put("type", status);
@@ -1446,6 +1502,13 @@
}
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
+ //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
+ if (201 == unitById.getUnitType()) {
+ CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
+ if (bjZzzx != null)
+ loginUser.setUnitId(bjZzzx.getId());
+ }
terms.put("handleUnitId", loginUser.getUnitId());
// 排序
Sort sort = null;
@@ -1593,22 +1656,23 @@
/**
* 测试接口
- * @url {ctx}/api/web/caseTask/test
+ *
* @return Object
+ * @url {ctx}/api/web/caseTask/test
*/
@GetMapping("/test")
public Object test(@RequestParam(value = "caseId") String caseId,
- @RequestParam(value = "oldTaskId") String oldTaskId, @RequestParam(value = "newTaskId") String newTaskId,
- @RequestParam(value = "oldProcess") String oldProcess,@RequestParam(value = "newProcess") String newProcess,
+ @RequestParam(value = "oldTaskId") String oldTaskId, @RequestParam(value = "newTaskId") String newTaskId,
+ @RequestParam(value = "oldProcess") String oldProcess, @RequestParam(value = "newProcess") String newProcess,
@RequestParam(value = "ownerIds") String ownerIds, @RequestParam(value = "userId") String userId,
@RequestParam(value = "handleStatus") String handleStatus) {
try {
CaseTask oldTask = null;
- if(StringUtils.isNotBlank(oldTaskId)){
+ if (StringUtils.isNotBlank(oldTaskId)) {
oldTask = service.getById(oldTaskId);
}
CaseTask newTask = null;
- if(StringUtils.isNotBlank(newTaskId)){
+ if (StringUtils.isNotBlank(newTaskId)) {
newTask = service.getById(newTaskId);
}
List<String> ownerIdList = Arrays.asList(ownerIds.split(","));
--
Gitblit v1.8.0