From 6de1aabe80a5fe03a8d2b46de00f3b24905d22fd Mon Sep 17 00:00:00 2001
From: Timer <@>
Date: Tue, 17 Mar 2026 00:53:23 +0800
Subject: [PATCH] =?UTF-8?q?bug=20fixed=20=E6=89=80=E5=B1=9E=E9=83=A8?=
=?UTF-8?q?=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../safety/StaffArchivesController.java | 20 +++++++++++++++++++
.../entity/safety/SafetyStaffArchivesVo.java | 4 ++++
.../safety/SafetyStaffArchivesMapper.xml | 3 +++
.../webapp/jsp/safety/staffArchivesAdd.jsp | 19 ++++++++++++++++--
.../webapp/jsp/safety/staffArchivesEdit.jsp | 19 ++++++++++++++++--
.../safety/userForOneSelectByStructure.jsp | 3 +++
6 files changed, 64 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/sipai/controller/safety/StaffArchivesController.java b/src/main/java/com/sipai/controller/safety/StaffArchivesController.java
index ce5b3369..02fd7e89 100644
--- a/src/main/java/com/sipai/controller/safety/StaffArchivesController.java
+++ b/src/main/java/com/sipai/controller/safety/StaffArchivesController.java
@@ -170,6 +170,16 @@ public class StaffArchivesController {
return "result";
}
+ // 更新用户的所属部门
+ String pid = request.getParameter("pid");
+ if(StringUtils.isNotBlank(pid)){
+ User user = this.userService.getUserById(safetyStaffArchives.getUserid());
+ if(user != null){
+ user.setPid(pid);
+ this.userService.updateUserById(user);
+ }
+ }
+
this.staffArchivesService.save(safetyStaffArchives);
model.addAttribute("result", CommUtil.toJson(Result.success()));
return "result";
@@ -195,6 +205,16 @@ public class StaffArchivesController {
return "result";
}
+ // 更新用户的所属部门
+ String pid = request.getParameter("pid");
+ if(StringUtils.isNotBlank(pid)){
+ User user = this.userService.getUserById(safetyStaffArchives.getUserid());
+ if(user != null){
+ user.setPid(pid);
+ this.userService.updateUserById(user);
+ }
+ }
+
int result = this.staffArchivesService.update(safetyStaffArchives);
model.addAttribute("result", CommUtil.toJson(Result.success()));
return "result";
diff --git a/src/main/java/com/sipai/entity/safety/SafetyStaffArchivesVo.java b/src/main/java/com/sipai/entity/safety/SafetyStaffArchivesVo.java
index 024a23cf..ef12cd30 100644
--- a/src/main/java/com/sipai/entity/safety/SafetyStaffArchivesVo.java
+++ b/src/main/java/com/sipai/entity/safety/SafetyStaffArchivesVo.java
@@ -22,6 +22,10 @@ public class SafetyStaffArchivesVo extends SafetyStaffArchives {
* 性别翻译
*/
private String sexText;
+ /**
+ * 所属部门ID
+ */
+ private String pid;
/**
* 所属部门
*/
diff --git a/src/main/java/com/sipai/mapper/safety/SafetyStaffArchivesMapper.xml b/src/main/java/com/sipai/mapper/safety/SafetyStaffArchivesMapper.xml
index bf125ba9..0c40233e 100644
--- a/src/main/java/com/sipai/mapper/safety/SafetyStaffArchivesMapper.xml
+++ b/src/main/java/com/sipai/mapper/safety/SafetyStaffArchivesMapper.xml
@@ -28,6 +28,7 @@
+
@@ -164,6 +165,7 @@
u.caption,
u.sex,
(case when u.sex='0' then '女' else '男' end) as sexText,
+ u.pid,
uu.name as deptName
from tb_safety_staff_archives ssa
INNER JOIN tb_user u ON ssa.userid = u.id
@@ -178,6 +180,7 @@
u.caption,
u.sex,
(case when u.sex='0' then '女' else '男' end) as sexText,
+ u.pid,
uu.name as deptName
from tb_safety_staff_archives ssa
INNER JOIN tb_user u ON ssa.userid = u.id
diff --git a/src/main/webapp/jsp/safety/staffArchivesAdd.jsp b/src/main/webapp/jsp/safety/staffArchivesAdd.jsp
index 081b540f..da405e6b 100644
--- a/src/main/webapp/jsp/safety/staffArchivesAdd.jsp
+++ b/src/main/webapp/jsp/safety/staffArchivesAdd.jsp
@@ -147,6 +147,7 @@
hiddenId: "userid",
textId: "username",
deptNameDom: "deptName",
+ deptIdDom: "pid",
sexDom: "sex",
userCardIdDom: "userCardId",
userId: userId
@@ -156,6 +157,18 @@
});
}
+ //选择所属部门
+ function showDept4SelectFun() {
+ $.post(ext.contextPath + '/user/showUnit4Select_Limited.do', {
+ formId: "subForm",
+ hiddenId: "pid",
+ textId: "deptName"
+ }, function (data) {
+ $("#deptSelectDiv").html(data);
+ openModal('unit4SelectModal_Limited');
+ });
+ }
+
@@ -274,3 +288,4 @@
+
diff --git a/src/main/webapp/jsp/safety/staffArchivesEdit.jsp b/src/main/webapp/jsp/safety/staffArchivesEdit.jsp
index 38a6807f..84f63814 100644
--- a/src/main/webapp/jsp/safety/staffArchivesEdit.jsp
+++ b/src/main/webapp/jsp/safety/staffArchivesEdit.jsp
@@ -152,6 +152,7 @@
hiddenId: "userid",
textId: "username",
deptNameDom: "deptName",
+ deptIdDom: "pid",
sexDom: "sex",
userCardIdDom: "userCardId",
userId: userId
@@ -161,6 +162,18 @@
});
}
+ //选择所属部门
+ function showDept4SelectFun() {
+ $.post(ext.contextPath + '/user/showUnit4Select_Limited.do', {
+ formId: "subForm",
+ hiddenId: "pid",
+ textId: "deptName"
+ }, function (data) {
+ $("#deptSelectDiv").html(data);
+ openModal('unit4SelectModal_Limited');
+ });
+ }
+
+
diff --git a/src/main/webapp/jsp/safety/userForOneSelectByStructure.jsp b/src/main/webapp/jsp/safety/userForOneSelectByStructure.jsp
index bfbc0b97..6a0503ef 100644
--- a/src/main/webapp/jsp/safety/userForOneSelectByStructure.jsp
+++ b/src/main/webapp/jsp/safety/userForOneSelectByStructure.jsp
@@ -26,6 +26,9 @@
if(`${param.deptNameDom}` != ""){
$('#${param.formId} #${param.deptNameDom}').val(resp[0]._pname);
}
+ if(`${param.deptIdDom}` != ""){
+ $('#${param.formId} #${param.deptIdDom}').val(resp[0].pid);
+ }
if(`${param.sexDom}` != ""){
$('#${param.formId} #${param.sexDom}').val(resp[0].sex);
}