diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java
index a269cb4c..131e0f05 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java
@@ -136,6 +136,7 @@ public class ApplyInfoListManager {
applyInfoList.setCreateBy(ShiroUtils.getSysUser().getUserName());
}
applyInfoList.setDeptId(ShiroUtils.getSysUser().getDeptId());
+ applyInfoList.setDeptName(ShiroUtils.getSysUser().getDept().getDeptName());
applyInfoList.setApplyStatus(ApplyListStatusEnum.NEWSAVE.getStatus());
return applyInfoListService.saveOrUpdate(applyInfoList);
}
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/add.html b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/add.html
index 0267ac4e..38abcab8 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/add.html
@@ -292,7 +292,7 @@
-
+
@@ -497,7 +497,7 @@
alert('请上传一寸照片');
return;
}
- this.$confirm('确认提交吗?', '提示', {
+ this.$confirm('确认保存吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -505,7 +505,7 @@
$.operate.saveTab(`${this.prefix}/add`,this.formData);
this.$message({
type: 'success',
- message: '提交成功!'
+ message: '保存成功!'
});
}).catch(() => {
this.$message({
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html
index fd2a3846..49540048 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html
@@ -65,7 +65,7 @@
updateUrl: prefix + "/edit/{id}",
detailUrl:prefix + "/editFile/{id}",
removeUrl: prefix + "/remove",
- modalName: "涉密人员上岗",
+ modalName: "涉密人员登记",
type: 0,
columns: [{
checkbox: true
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html
index 8c5e28b4..b270f919 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html
@@ -292,7 +292,7 @@
-
+
@@ -496,7 +496,7 @@
})
return;
}
- this.$confirm('确认提交吗?', '提示', {
+ this.$confirm('确认保存吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -504,7 +504,7 @@
$.operate.saveTab(`${this.prefix}/edit`,this.formData);
this.$message({
type: 'success',
- message: '提交成功!'
+ message: '保存成功!'
});
}).catch(() => {
this.$message({
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java
index 7ae3b371..34ada7d5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java
@@ -65,6 +65,12 @@ public class TdApplyInfoList extends BaseEntity {
*/
private Long deptId;
+
+ /**
+ * 部门id
+ */
+ private String deptName;
+
/**
* 曾用名
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/TdApplyInfoListDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/TdApplyInfoListDTO.java
index 28f1b83b..9c3efb27 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/TdApplyInfoListDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/TdApplyInfoListDTO.java
@@ -69,6 +69,11 @@ public class TdApplyInfoListDTO extends BaseEntity {
*/
private Long deptId;
+ /**
+ * 部门id
+ */
+ private String deptName;
+
/**
* 曾用名
*/
diff --git a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml
index 83a21e7a..ea244e02 100644
--- a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml
@@ -36,6 +36,7 @@
+
@@ -48,7 +49,7 @@
political,phone,cerno,
address,registered_authority,permanent_address,
resident_bureau,position_capacity,sm_post,
- sm_grade,photo_url,leave_msg,leave_time
+ sm_grade,photo_url,leave_msg,leave_time,dept_name