From 4c189dd5a43ae325ed13e753fcf0331bc3fdf7e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
<7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sun, 23 Feb 2025 22:08:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/system/SysUserExtMapper.xml | 8 ++--
...roProjectInfoSubdeptsUsersServiceImpl.java | 46 ++++++++++---------
.../src/views/system/user/index.vue | 10 ++--
3 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml
index d888a126..b7f21a12 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml
@@ -21,12 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
index 28fe0c64..57223338 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
@@ -79,6 +79,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
@Autowired
private SysUserMapper sysUserMapper;
+
private static final Logger log = LoggerFactory.getLogger(ProProjectInfoSubdeptsUsersServiceImpl.class);
/**
@@ -1185,14 +1186,15 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
// 审核文件签名
ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id);
String filePath = proProjectInfoSubdeptsUsers.getEduFilePath().replace(ProfileConfig.profile, ProfileConfig.profilePath);
- ProProjectInfoSubdeptsUsers userQuery = new ProProjectInfoSubdeptsUsers();
- userQuery.setWorkType(101L);
- userQuery.setProjectId(proProjectInfoSubdeptsUsers.getProjectId());
- List users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery);
- if(StringUtils.isNotEmpty(users)){
+ SysUserExt extQuery = new SysUserExt();
+ extQuery.setComId(proProjectInfoSubdeptsUsers.getComId());
+ extQuery.setWorkType(101L);
+ extQuery.setStatus(Convert.toStr(IsDelEnums.NO.getCode()));
+ List sysUserExtList = sysUserExtMapper.selectSysUserExtList(extQuery);
+ if(StringUtils.isNotEmpty(sysUserExtList)){
BasSignet query = new BasSignet();
- query.setProjectId(users.get(0).getProjectId());
- query.setUserId(users.get(0).getUserId());
+ query.setComId(sysUserExtList.get(0).getProjectId());
+ query.setUserId(sysUserExtList.get(0).getUserId());
List signets = basSignetMapper.selectBasSignetList(query);
if(StringUtils.isNotEmpty(signets)){
String newFilePath = filePath.replace(".pdf","-c.pdf");
@@ -1222,14 +1224,15 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
public Boolean findUserComSign(Long id){
// 审核文件签名
ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id);
- ProProjectInfoSubdeptsUsers userQuery = new ProProjectInfoSubdeptsUsers();
- userQuery.setWorkType(101L);
- userQuery.setComId(proProjectInfoSubdeptsUsers.getComId());
- List users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery);
- if(StringUtils.isNotEmpty(users)){
+ SysUserExt extQuery = new SysUserExt();
+ extQuery.setComId(proProjectInfoSubdeptsUsers.getComId());
+ extQuery.setWorkType(101L);
+ extQuery.setStatus(Convert.toStr(IsDelEnums.NO.getCode()));
+ List sysUserExtList = sysUserExtMapper.selectSysUserExtList(extQuery);
+ if(StringUtils.isNotEmpty(sysUserExtList)){
BasSignet query = new BasSignet();
- query.setComId(users.get(0).getComId());
- query.setUserId(users.get(0).getUserId());
+ query.setComId(sysUserExtList.get(0).getComId());
+ query.setUserId(sysUserExtList.get(0).getUserId());
List signets = basSignetMapper.selectBasSignetList(query);
if(StringUtils.isNotEmpty(signets)){
return true;
@@ -1465,14 +1468,15 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
throw new ServiceException("未查询安质部部长签名信息...");
}
- ProProjectInfoSubdeptsUsers comUserQuery = new ProProjectInfoSubdeptsUsers();
- comUserQuery.setWorkType(101L);
- comUserQuery.setProjectId(proProjectInfoSubdeptsUsers.getProjectId());
- List comUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(comUserQuery);
- if(StringUtils.isNotEmpty(comUsers)){
+ SysUserExt extQuery = new SysUserExt();
+ extQuery.setComId(proProjectInfoSubdeptsUsers.getComId());
+ extQuery.setWorkType(101L);
+ extQuery.setStatus(Convert.toStr(IsDelEnums.NO.getCode()));
+ List sysUserExtList = sysUserExtMapper.selectSysUserExtList(extQuery);
+ if(StringUtils.isNotEmpty(sysUserExtList)){
BasSignet query = new BasSignet();
- query.setProjectId(comUsers.get(0).getProjectId());
- query.setUserId(comUsers.get(0).getUserId());
+ query.setComId(sysUserExtList.get(0).getProjectId());
+ query.setUserId(sysUserExtList.get(0).getUserId());
List signets = basSignetMapper.selectBasSignetList(query);
if(StringUtils.isNotEmpty(signets)){
String newFilePath = filePath.replace(".pdf","-c.pdf");
diff --git a/yanzhu-ui-vue3/src/views/system/user/index.vue b/yanzhu-ui-vue3/src/views/system/user/index.vue
index 28df75e8..9fdcd139 100644
--- a/yanzhu-ui-vue3/src/views/system/user/index.vue
+++ b/yanzhu-ui-vue3/src/views/system/user/index.vue
@@ -216,12 +216,12 @@
-
+
-
+
@@ -486,7 +486,7 @@ function doCleanEditData() {
function doRoleChange() {
if (data.mode == 'add') {
- if (form.value.userType == 99) {
+ if (form.value.userType == '08') {
data.rules = {
deptId: [{ required: true, message: "所属单位不能为空", trigger: "change" }],
userName: [{ required: false, message: "登录账号不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
@@ -516,7 +516,7 @@ function doRoleChange() {
form.value.workType = '';
}
else {
- if (form.value.userType == 99) {
+ if (form.value.userType == '08') {
data.rules = {
userName: [{ required: false, message: "登录账号不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
nickName: [{ required: true, message: "用户姓名不能为空", trigger: "blur" }],
@@ -735,7 +735,7 @@ function handleUpdate(row) {
form.value.postIds = response.postIds;
form.value.roleIds = response.roleIds;
form.value.workType = form.value.workType ? "" + form.value.workType : "";
- if (form.value.userType == '99') {
+ if (form.value.userType == '08') {
let tmps = user_work_type.value.filter(d => d.value == form.value.workType);
if (tmps.length > 0) {
form.value.userWorkType = tmps[0].remark;