优化:添加编辑部门允许负责人为空

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java

@@ -3,6 +3,8 @@ package net.lab1024.sa.admin.module.system.department.domain.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -34,6 +36,7 @@ public class DepartmentEntity {
     /**
      * 负责人员工 id
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Long managerId;
 
     /**

smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java

@@ -3,6 +3,8 @@ package net.lab1024.sa.admin.module.system.department.domain.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -34,6 +36,7 @@ public class DepartmentEntity {
     /**
      * 负责人员工 id
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long managerId;
 
     /**

smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue

@@ -11,16 +11,18 @@
   <a-modal v-model:open="visible" :title="formState.departmentId ? '编辑部门' : '添加部门'" @ok="handleOk" destroyOnClose>
     <a-form ref="formRef" :model="formState" :rules="rules" layout="vertical">
       <a-form-item label="上级部门" name="parentId" v-if="formState.parentId != 0">
-        <DepartmentTreeSelect ref="departmentTreeSelect" v-model:value="formState.parentId" :defaultValueFlag="false" width="100%" />
+        <DepartmentTreeSelect ref="departmentTreeSelect" v-model:value="formState.parentId" :defaultValueFlag="false"
+          width="100%" />
       </a-form-item>
       <a-form-item label="部门名称" name="name">
         <a-input v-model:value.trim="formState.name" placeholder="请输入部门名称" />
       </a-form-item>
       <a-form-item label="部门负责人" name="managerId">
-        <EmployeeSelect ref="employeeSelect" placeholder="请选择部门负责人" width="100%" v-model:value="formState.managerId" :leaveFlag="false" />
+        <EmployeeSelect ref="employeeSelect" placeholder="请选择部门负责人" width="100%" v-model:value="formState.managerId"
+          :leaveFlag="false" />
       </a-form-item>
       <a-form-item label="部门排序 （值越大越靠前！）" name="sort">
-        <a-input-number style="width: 100%" v-model:value="formState.sort" :min="0" placeholder="请输入部门名称" />
+        <a-input-number style="width: 100%" v-model:value="formState.sort" :min="0" placeholder="请输入部门排序" />
       </a-form-item>
     </a-form>
   </a-modal>
@@ -75,7 +77,6 @@
     { required: true, message: '部门名称不能为空' },
     { max: 50, message: '部门名称不能大于20个字符', trigger: 'blur' },
   ],
-    managerId: [{ required: true, message: '部门负责人不能为空' }],
 };
 // 更新表单数据
 function updateFormData(data) {
@@ -123,7 +124,7 @@
   SmartLoading.show();
   try {
     if (formState.parentId == formState.departmentId) {
-        message.warning('上级菜单不能为自己');
+      message.warning('上级部门不能为自己');
       return;
     }
     await departmentApi.updateDepartment(formState);

smart-admin-web-typescript/src/views/system/department/components/department-form-modal.vue

@@ -11,16 +11,18 @@
   <a-modal v-model:open="visible" :title="formState.departmentId ? '编辑部门' : '添加部门'" @ok="handleOk" destroyOnClose>
     <a-form ref="formRef" :model="formState" :rules="rules" layout="vertical">
       <a-form-item label="上级部门" name="parentId" v-if="formState.parentId != 0">
-        <DepartmentTreeSelect ref="departmentTreeSelect" v-model:value="formState.parentId" :defaultValueFlag="false" width="100%" />
+        <DepartmentTreeSelect ref="departmentTreeSelect" v-model:value="formState.parentId" :defaultValueFlag="false"
+          width="100%" />
       </a-form-item>
       <a-form-item label="部门名称" name="name">
         <a-input v-model:value.trim="formState.name" placeholder="请输入部门名称" />
       </a-form-item>
       <a-form-item label="部门负责人" name="managerId">
-        <EmployeeSelect ref="employeeSelect" placeholder="请选择部门负责人" width="100%" v-model:value="formState.managerId" :leaveFlag="false" />
+        <EmployeeSelect ref="employeeSelect" placeholder="请选择部门负责人" width="100%" v-model:value="formState.managerId"
+          :leaveFlag="false" />
       </a-form-item>
       <a-form-item label="部门排序 （值越大越靠前！）" name="sort">
-        <a-input-number style="width: 100%" v-model:value="formState.sort" :min="0" placeholder="请输入部门名称" />
+        <a-input-number style="width: 100%" v-model:value="formState.sort" :min="0" placeholder="请输入部门排序" />
       </a-form-item>
     </a-form>
   </a-modal>
@@ -75,7 +77,6 @@
     { required: true, message: '部门名称不能为空' },
     { max: 50, message: '部门名称不能大于20个字符', trigger: 'blur' },
   ],
-    managerId: [{ required: true, message: '部门负责人不能为空' }],
 };
 // 更新表单数据
 function updateFormData(data) {
@@ -123,7 +124,7 @@
   SmartLoading.show();
   try {
     if (formState.parentId == formState.departmentId) {
-        message.warning('上级菜单不能为自己');
+      message.warning('上级部门不能为自己');
       return;
     }
     await departmentApi.updateDepartment(formState);