From 11a4a369627c2faa093005970f37d3761759fc2f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 21 三月 2025 11:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
start/src/main/resources/application-dev.yml | 2 +-
business/src/main/java/com/ycl/service/impl/CodingRulerServiceImpl.java | 2 +-
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 18 ++++++++++++++++--
system/src/main/java/com/ycl/system/service/ISysUserService.java | 1 +
system/src/main/resources/mapper/system/SysUserMapper.xml | 2 ++
5 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/CodingRulerServiceImpl.java b/business/src/main/java/com/ycl/service/impl/CodingRulerServiceImpl.java
index 1b72990..60b119e 100644
--- a/business/src/main/java/com/ycl/service/impl/CodingRulerServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/CodingRulerServiceImpl.java
@@ -137,7 +137,7 @@
.eq(CodingRuler::getDeleted,0)
.one();
if (statusStartCodingRuler != null) {
- throw new RuntimeException("宸插惎鍔ㄨ绉嶈祴鐮佽鍒�");
+ throw new RuntimeException("鐩稿悓椤圭洰鐮佺被鍨嬪悓鏃跺彧鑳藉惎鍔ㄤ竴绉�");
}
codingRuler.setStatus(CodingRulerStatusEnum.on.getValue());
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index c747293..819ae1d 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -934,6 +934,7 @@
* @param result
*/
public void getTodoTaskList(String projectId, String processInsId, String taskName, int pageSize, int pageNum, Result result) {
+
TaskQuery taskQuery = taskService.createTaskQuery()
.active()
.processInstanceId(processInsId)
@@ -1249,7 +1250,14 @@
taskVO.getHandlerUnitId().add(sysUser.getDept().getDeptId());
taskVO.getHandlerUnitName().add(sysUser.getDept().getDeptName());
taskVO.getPromoterName().add(this.getUserShowName(sysUser));
- taskVO.getPromoterUnitName().add(sysUser.getDept().getDeptName());
+// if (sysUser.getDept().getAncestors())
+ String[] str = sysUser.getDept().getAncestors().split(",");
+ if (str.length >= 4){
+ taskVO.getPromoterUnitName().add(sysUser.getDept().getParentName() +"-"+sysUser.getDept().getDeptName());
+ }else {
+ taskVO.getPromoterUnitName().add(sysUser.getDept().getDeptName());
+ }
+
}
}
// 缁戝畾鐨勬槸瑙掕壊鎴栬�呴儴闂�
@@ -1264,7 +1272,13 @@
taskVO.getHandlerUnitId().add(dept.getDeptId());
taskVO.getHandlerUnitName().add(dept.getDeptName());
taskVO.getPromoterName().add(this.getDeptLeaderShowName(dept));
- taskVO.getPromoterUnitName().add(dept.getDeptName());
+ String[] str = dept.getAncestors().split(",");
+ if (str.length >= 4){
+ taskVO.getPromoterUnitName().add(dept.getParentName() +"-"+dept.getDeptName());
+ }else {
+ taskVO.getPromoterUnitName().add(dept.getDeptName());
+ }
+
}
}
} else {
diff --git a/start/src/main/resources/application-dev.yml b/start/src/main/resources/application-dev.yml
index a538976..619b51a 100644
--- a/start/src/main/resources/application-dev.yml
+++ b/start/src/main/resources/application-dev.yml
@@ -45,7 +45,7 @@
# 涓诲簱鏁版嵁婧�
master:
# url: jdbc:mysql://42.193.1.25:3306/project_management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
- url: jdbc:mysql://42.193.1.25:3306/project_management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowMultiQueries=true
+ url: jdbc:mysql://42.193.1.25:3306/project_management_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowMultiQueries=true
username: root
password: 321$YcYl@1970!
# 浠庡簱鏁版嵁婧�
diff --git a/system/src/main/java/com/ycl/system/service/ISysUserService.java b/system/src/main/java/com/ycl/system/service/ISysUserService.java
index 1468979..d979aef 100644
--- a/system/src/main/java/com/ycl/system/service/ISysUserService.java
+++ b/system/src/main/java/com/ycl/system/service/ISysUserService.java
@@ -215,4 +215,5 @@
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
List<SysUser> getByDept(Long deptId);
+
}
diff --git a/system/src/main/resources/mapper/system/SysUserMapper.xml b/system/src/main/resources/mapper/system/SysUserMapper.xml
index 1eb7d74..abf1553 100644
--- a/system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -36,6 +36,7 @@
<result property="leader" column="leader" />
<result property="phone" column="phone" />
<result property="status" column="dept_status" />
+ <result property="parentName" column="parent_name" />
</resultMap>
<resultMap id="RoleResult" type="SysRole">
@@ -50,6 +51,7 @@
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.status as dept_status,
+ (select dept_name from sys_dept where dept_id = d.parent_id) parent_name,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
--
Gitblit v1.8.0