From 77ed1880a1c8e56b07131760b15e7b25c538b595 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 18:22:42 +0800
Subject: [PATCH] 项目库直接取当前用户单位
---
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 2 +-
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java | 2 +-
business/src/main/java/com/ycl/listener/flowable/FlowableOverTimeListener.java | 2 +-
business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java | 2 +-
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 2 ++
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 2 +-
6 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
index 2b74065..db0f998 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
@@ -123,7 +123,7 @@
@TableField("project_owner_unit")
/** 椤圭洰涓氫富鍗曚綅 */
- private String projectOwnerUnit;
+ private Long projectOwnerUnit;
@TableField("project_contact_person")
/** 椤圭洰鑱旂郴浜� */
diff --git a/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java b/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
index 510292d..1835e0e 100644
--- a/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
+++ b/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
@@ -201,7 +201,7 @@
* 椤圭洰涓氫富鍗曚綅
*/
@ExcelProperty(value = "椤圭洰涓氫富鍗曚綅")
- private String projectOwnerUnit;
+ private Long projectOwnerUnit;
/**
* 璁″垝寮�宸ユ椂闂�
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
index c540050..a817517 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
@@ -113,7 +113,7 @@
private String latitude;
@ApiModelProperty("椤圭洰涓氫富鍗曚綅")
- private String projectOwnerUnit;
+ private Long projectOwnerUnit;
@ApiModelProperty("椤圭洰鑱旂郴浜�")
private String projectContactPerson;
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
index f1da1e0..d0dd286 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -135,7 +135,7 @@
/** 椤圭洰涓氫富鍗曚綅 */
@ApiModelProperty("椤圭洰涓氫富鍗曚綅")
- private String projectOwnerUnit;
+ private Long projectOwnerUnit;
/** 椤圭洰鑱旂郴浜� */
@ApiModelProperty("椤圭洰鑱旂郴浜�")
diff --git a/business/src/main/java/com/ycl/listener/flowable/FlowableOverTimeListener.java b/business/src/main/java/com/ycl/listener/flowable/FlowableOverTimeListener.java
index 4be1147..e7f335f 100644
--- a/business/src/main/java/com/ycl/listener/flowable/FlowableOverTimeListener.java
+++ b/business/src/main/java/com/ycl/listener/flowable/FlowableOverTimeListener.java
@@ -59,7 +59,7 @@
processCoding.setTaskId(taskId);
processCoding.setProcessInsId(processInstanceId);
processCoding.setTaskDefKey(delegateTask.getTaskDefinitionKey());
- //鏌ヨ鏄惁鏈夎繖涓畾涔夎妭鐐圭殑鍘嗗彶鏁版嵁锛屽彇鏈�鏅氱殑涓�鏉＄姸鎬佺爜锛岄伩鍏嶅畾鏃朵换鍔¤繕鏈墽琛岀殑璇樊
+ //璁剧疆鐘舵�侊紝鏌ヨ鏄惁鏈夎繖涓畾涔夎妭鐐圭殑鍘嗗彶鏁版嵁锛屽彇鏈�鏂扮殑涓�鏉＄姸鎬佺爜锛岄伩鍏嶅畾鏃朵换鍔¤繕鏈墽琛岀殑璇樊
List<ProcessCoding> processCodings = processCodingMapper.selectList(new QueryWrapper<ProcessCoding>()
.eq("process_ins_id",processInstanceId)
.eq("task_def_key", delegateTask.getTaskDefinitionKey())
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 1210f57..8a89c46 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -103,6 +103,8 @@
//娣诲姞鍩烘湰淇℃伅
ProjectInfo entity = ProjectInfoForm.getEntityByForm(form, null);
Long userId = SecurityUtils.getUserId();
+ Long deptId = SecurityUtils.getDeptId();
+ entity.setProjectOwnerUnit(deptId);
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
baseMapper.insert(entity);
--
Gitblit v1.8.0