From 2dd72e404a4e65882710bbef06d6c86e39f34d6a Mon Sep 17 00:00:00 2001
From: SillyBoy <1519058322@qq.com>
Date: Sat, 1 Mar 2025 19:38:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=E6=B7=BB=E5=8A=A0=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=83=A8=E9=97=A8=E5=85=81=E8=AE=B8=E8=B4=9F=E8=B4=A3?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/entity/DepartmentEntity.java       |   3 +
 .../domain/entity/DepartmentEntity.java       |   3 +
 .../components/department-form-modal.vue      | 199 +++++++++---------
 .../components/department-form-modal.vue      | 199 +++++++++---------
 4 files changed, 206 insertions(+), 198 deletions(-)

diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
index 52882f8d..3887b47f 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
+++ b/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;
 
     /**
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
index 52882f8d..a76ea7e9 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
+++ b/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;
 
     /**
diff --git a/smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue b/smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue
index c2a245c6..1abb2be7 100644
--- a/smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue
+++ b/smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue
@@ -11,128 +11,129 @@
   <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>
 </template>
 <script setup>
-  import message from 'ant-design-vue/lib/message';
-  import { reactive, ref } from 'vue';
-  import { departmentApi } from '/@/api/system/department-api';
-  import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
-  import EmployeeSelect from '/@/components/system/employee-select/index.vue';
-  import { smartSentry } from '/@/lib/smart-sentry';
-  import { SmartLoading } from '/@/components/framework/smart-loading';
+import message from 'ant-design-vue/lib/message';
+import { reactive, ref } from 'vue';
+import { departmentApi } from '/@/api/system/department-api';
+import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
+import EmployeeSelect from '/@/components/system/employee-select/index.vue';
+import { smartSentry } from '/@/lib/smart-sentry';
+import { SmartLoading } from '/@/components/framework/smart-loading';
 
-  // ----------------------- 对外暴漏 ---------------------
+// ----------------------- 对外暴漏 ---------------------
 
-  defineExpose({
-    showModal,
-  });
+defineExpose({
+  showModal,
+});
 
-  // ----------------------- modal 的显示与隐藏 ---------------------
-  const emits = defineEmits(['refresh']);
+// ----------------------- modal 的显示与隐藏 ---------------------
+const emits = defineEmits(['refresh']);
 
-  const visible = ref(false);
-  function showModal(data) {
-    visible.value = true;
-    updateFormData(data);
-  }
-  function closeModal() {
-    visible.value = false;
-    resetFormData();
+const visible = ref(false);
+function showModal(data) {
+  visible.value = true;
+  updateFormData(data);
+}
+function closeModal() {
+  visible.value = false;
+  resetFormData();
+}
+
+// ----------------------- form 表单操作 ---------------------
+const formRef = ref();
+const departmentTreeSelect = ref();
+const defaultDepartmentForm = {
+  id: undefined,
+  managerId: undefined, //部门负责人
+  name: undefined,
+  parentId: undefined,
+  sort: 0,
+};
+const employeeSelect = ref();
+
+let formState = reactive({
+  ...defaultDepartmentForm,
+});
+// 表单校验规则
+const rules = {
+  parentId: [{ required: true, message: '上级部门不能为空' }],
+  name: [
+    { required: true, message: '部门名称不能为空' },
+    { max: 50, message: '部门名称不能大于20个字符', trigger: 'blur' },
+  ],
+};
+// 更新表单数据
+function updateFormData(data) {
+  Object.assign(formState, defaultDepartmentForm);
+  if (data) {
+    Object.assign(formState, data);
   }
+  visible.value = true;
+}
+// 重置表单数据
+function resetFormData() {
+  Object.assign(formState, defaultDepartmentForm);
+}
 
-  // ----------------------- form 表单操作 ---------------------
-  const formRef = ref();
-  const departmentTreeSelect = ref();
-  const defaultDepartmentForm = {
-    id: undefined,
-    managerId: undefined, //部门负责人
-    name: undefined,
-    parentId: undefined,
-    sort: 0,
-  };
-  const employeeSelect = ref();
-
-  let formState = reactive({
-    ...defaultDepartmentForm,
-  });
-  // 表单校验规则
-  const rules = {
-    parentId: [{ required: true, message: '上级部门不能为空' }],
-    name: [
-      { required: true, message: '部门名称不能为空' },
-      { max: 50, message: '部门名称不能大于20个字符', trigger: 'blur' },
-    ],
-    managerId: [{ required: true, message: '部门负责人不能为空' }],
-  };
-  // 更新表单数据
-  function updateFormData(data) {
-    Object.assign(formState, defaultDepartmentForm);
-    if (data) {
-      Object.assign(formState, data);
+async function handleOk() {
+  try {
+    await formRef.value.validate();
+    if (formState.departmentId) {
+      updateDepartment();
+    } else {
+      addDepartment();
     }
-    visible.value = true;
-  }
-  // 重置表单数据
-  function resetFormData() {
-    Object.assign(formState, defaultDepartmentForm);
+  } catch (error) {
+    message.error('参数验证错误，请仔细填写表单数据!');
   }
+}
 
-  async function handleOk() {
-    try {
-      await formRef.value.validate();
-      if (formState.departmentId) {
-        updateDepartment();
-      } else {
-        addDepartment();
-      }
-    } catch (error) {
-      message.error('参数验证错误，请仔细填写表单数据!');
-    }
+// ----------------------- form 表单  ajax 操作 ---------------------
+//添加部门ajax请求
+async function addDepartment() {
+  SmartLoading.show();
+  try {
+    await departmentApi.addDepartment(formState);
+    emits('refresh');
+    closeModal();
+  } catch (error) {
+    smartSentry.captureError(error);
+  } finally {
+    SmartLoading.hide();
   }
+}
 
-  // ----------------------- form 表单  ajax 操作 ---------------------
-  //添加部门ajax请求
-  async function addDepartment() {
-    SmartLoading.show();
-    try {
-      await departmentApi.addDepartment(formState);
-      emits('refresh');
-      closeModal();
-    } catch (error) {
-      smartSentry.captureError(error);
-    } finally {
-      SmartLoading.hide();
-    }
-  }
-
-  //更新部门ajax请求
-  async function updateDepartment() {
-    SmartLoading.show();
-    try {
-      if (formState.parentId == formState.departmentId) {
-        message.warning('上级菜单不能为自己');
-        return;
-      }
-      await departmentApi.updateDepartment(formState);
-      emits('refresh');
-      closeModal();
-    } catch (error) {
-      smartSentry.captureError(error);
-    } finally {
-      SmartLoading.hide();
+//更新部门ajax请求
+async function updateDepartment() {
+  SmartLoading.show();
+  try {
+    if (formState.parentId == formState.departmentId) {
+      message.warning('上级部门不能为自己');
+      return;
     }
+    await departmentApi.updateDepartment(formState);
+    emits('refresh');
+    closeModal();
+  } catch (error) {
+    smartSentry.captureError(error);
+  } finally {
+    SmartLoading.hide();
   }
+}
 </script>
diff --git a/smart-admin-web-typescript/src/views/system/department/components/department-form-modal.vue b/smart-admin-web-typescript/src/views/system/department/components/department-form-modal.vue
index f11bee44..0f56a68a 100644
--- a/smart-admin-web-typescript/src/views/system/department/components/department-form-modal.vue
+++ b/smart-admin-web-typescript/src/views/system/department/components/department-form-modal.vue
@@ -11,128 +11,129 @@
   <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>
 </template>
 <script setup lang="ts">
-  import message from 'ant-design-vue/lib/message';
-  import { reactive, ref } from 'vue';
-  import { departmentApi } from '/@/api/system/department-api';
-  import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
-  import EmployeeSelect from '/@/components/system/employee-select/index.vue';
-  import { smartSentry } from '/@/lib/smart-sentry';
-  import { SmartLoading } from '/@/components/framework/smart-loading';
+import message from 'ant-design-vue/lib/message';
+import { reactive, ref } from 'vue';
+import { departmentApi } from '/@/api/system/department-api';
+import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
+import EmployeeSelect from '/@/components/system/employee-select/index.vue';
+import { smartSentry } from '/@/lib/smart-sentry';
+import { SmartLoading } from '/@/components/framework/smart-loading';
 
-  // ----------------------- 对外暴漏 ---------------------
+// ----------------------- 对外暴漏 ---------------------
 
-  defineExpose({
-    showModal,
-  });
+defineExpose({
+  showModal,
+});
 
-  // ----------------------- modal 的显示与隐藏 ---------------------
-  const emits = defineEmits(['refresh']);
+// ----------------------- modal 的显示与隐藏 ---------------------
+const emits = defineEmits(['refresh']);
 
-  const visible = ref(false);
-  function showModal(data) {
-    visible.value = true;
-    updateFormData(data);
-  }
-  function closeModal() {
-    visible.value = false;
-    resetFormData();
+const visible = ref(false);
+function showModal(data) {
+  visible.value = true;
+  updateFormData(data);
+}
+function closeModal() {
+  visible.value = false;
+  resetFormData();
+}
+
+// ----------------------- form 表单操作 ---------------------
+const formRef = ref();
+const departmentTreeSelect = ref();
+const defaultDepartmentForm = {
+  id: undefined,
+  managerId: undefined, //部门负责人
+  name: undefined,
+  parentId: undefined,
+  sort: 0,
+};
+const employeeSelect = ref();
+
+let formState = reactive({
+  ...defaultDepartmentForm,
+});
+// 表单校验规则
+const rules = {
+  parentId: [{ required: true, message: '上级部门不能为空' }],
+  name: [
+    { required: true, message: '部门名称不能为空' },
+    { max: 50, message: '部门名称不能大于20个字符', trigger: 'blur' },
+  ],
+};
+// 更新表单数据
+function updateFormData(data) {
+  Object.assign(formState, defaultDepartmentForm);
+  if (data) {
+    Object.assign(formState, data);
   }
+  visible.value = true;
+}
+// 重置表单数据
+function resetFormData() {
+  Object.assign(formState, defaultDepartmentForm);
+}
 
-  // ----------------------- form 表单操作 ---------------------
-  const formRef = ref();
-  const departmentTreeSelect = ref();
-  const defaultDepartmentForm = {
-    id: undefined,
-    managerId: undefined, //部门负责人
-    name: undefined,
-    parentId: undefined,
-    sort: 0,
-  };
-  const employeeSelect = ref();
-
-  let formState = reactive({
-    ...defaultDepartmentForm,
-  });
-  // 表单校验规则
-  const rules = {
-    parentId: [{ required: true, message: '上级部门不能为空' }],
-    name: [
-      { required: true, message: '部门名称不能为空' },
-      { max: 50, message: '部门名称不能大于20个字符', trigger: 'blur' },
-    ],
-    managerId: [{ required: true, message: '部门负责人不能为空' }],
-  };
-  // 更新表单数据
-  function updateFormData(data) {
-    Object.assign(formState, defaultDepartmentForm);
-    if (data) {
-      Object.assign(formState, data);
+async function handleOk() {
+  try {
+    await formRef.value.validate();
+    if (formState.departmentId) {
+      updateDepartment();
+    } else {
+      addDepartment();
     }
-    visible.value = true;
-  }
-  // 重置表单数据
-  function resetFormData() {
-    Object.assign(formState, defaultDepartmentForm);
+  } catch (error) {
+    message.error('参数验证错误，请仔细填写表单数据!');
   }
+}
 
-  async function handleOk() {
-    try {
-      await formRef.value.validate();
-      if (formState.departmentId) {
-        updateDepartment();
-      } else {
-        addDepartment();
-      }
-    } catch (error) {
-      message.error('参数验证错误，请仔细填写表单数据!');
-    }
+// ----------------------- form 表单  ajax 操作 ---------------------
+//添加部门ajax请求
+async function addDepartment() {
+  SmartLoading.show();
+  try {
+    await departmentApi.addDepartment(formState);
+    emits('refresh');
+    closeModal();
+  } catch (error) {
+    smartSentry.captureError(error);
+  } finally {
+    SmartLoading.hide();
   }
+}
 
-  // ----------------------- form 表单  ajax 操作 ---------------------
-  //添加部门ajax请求
-  async function addDepartment() {
-    SmartLoading.show();
-    try {
-      await departmentApi.addDepartment(formState);
-      emits('refresh');
-      closeModal();
-    } catch (error) {
-      smartSentry.captureError(error);
-    } finally {
-      SmartLoading.hide();
-    }
-  }
-
-  //更新部门ajax请求
-  async function updateDepartment() {
-    SmartLoading.show();
-    try {
-      if (formState.parentId == formState.departmentId) {
-        message.warning('上级菜单不能为自己');
-        return;
-      }
-      await departmentApi.updateDepartment(formState);
-      emits('refresh');
-      closeModal();
-    } catch (error) {
-      smartSentry.captureError(error);
-    } finally {
-      SmartLoading.hide();
+//更新部门ajax请求
+async function updateDepartment() {
+  SmartLoading.show();
+  try {
+    if (formState.parentId == formState.departmentId) {
+      message.warning('上级部门不能为自己');
+      return;
     }
+    await departmentApi.updateDepartment(formState);
+    emits('refresh');
+    closeModal();
+  } catch (error) {
+    smartSentry.captureError(error);
+  } finally {
+    SmartLoading.hide();
   }
+}
 </script>