feat:添加部门名称和页面提示

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);
     }

ruoyi-admin/src/main/resources/templates/system/newdev/apply/add.html

@@ -292,7 +292,7 @@
                 </form>
                 <div class="row mt-6">
                     <div class="col-sm-offset-5 col-sm-10" style="display: flex;">
-                        <button type="button" class="btn btn-sm btn-primary" @click="submitHandler()"><i class="fa fa-check"></i>提 交</button>&nbsp;
+                        <button type="button" class="btn btn-sm btn-primary" @click="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
                         <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭
                         </button>
                     </div>
@@ -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({

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

ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html

@@ -292,7 +292,7 @@
                 </form>
                 <div class="row mt-6">
                     <div class="col-sm-offset-5 col-sm-10" style="display: flex;">
-                        <button type="button" class="btn btn-sm btn-primary" @click="submitHandler()"><i class="fa fa-check"></i>提 交</button>&nbsp;
+                        <button type="button" class="btn btn-sm btn-primary" @click="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
                         <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭
                         </button>
                     </div>
@@ -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({

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;
+
     /**
      * 曾用名
      */

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;
+
     /**
      * 曾用名
      */

ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml

@@ -36,6 +36,7 @@
             <result property="photoUrl" column="photo_url" jdbcType="VARCHAR"/>
             <result property="leaveMsg" column="leave_msg" jdbcType="VARCHAR"/>
             <result property="leaveTime" column="leave_time" jdbcType="TIMESTAMP"/>
+            <result property="deptName" column="dept_name" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -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
     </sql>
     <select id="selectTdApplyInfoListList" resultType="com.ruoyi.system.domain.apply.TdApplyInfoList">
             select  <include refid="Base_Column_List"/> from  td_apply_info_list d