Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/dept/add/AddDeptService.java

@@ -99,7 +99,7 @@ public class AddDeptService {
             return JsonResult.error(AddDeptCodeEnum.DEPT_NAME_IS_NULL.getCode(), AddDeptCodeEnum.DEPT_NAME_IS_NULL.getMsg());
         }
 
-        if ("0".equals(addDeptRequest.getPid())) {
+        if (SystemConstant.ROOT_DEPT_PID.equals(addDeptRequest.getPid())) {
             Integer count = deptMapper.selectCount(new LambdaQueryWrapper<Dept>()
                     .eq(Dept::getTenantId, tenantId)
                     .eq(Dept::getPid, addDeptRequest.getPid())

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/dept/update/UpdateDeptService.java

@@ -1,6 +1,7 @@
 package com.tuoheng.admin.service.dept.update;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.tuoheng.admin.constant.SystemConstant;
 import com.tuoheng.admin.dto.RoadSectionDto;
 import com.tuoheng.admin.entity.*;
 import com.tuoheng.admin.enums.code.dept.EditDeptCodeEnum;
@@ -110,7 +111,7 @@ public class UpdateDeptService {
             return JsonResult.error(EditDeptCodeEnum.DEPT_IS_NOT_EXIST.getCode(), EditDeptCodeEnum.DEPT_IS_NOT_EXIST.getMsg());
         }
 
-        if ("0".equals(newEditDeptRequest.getPid())) {
+        if (SystemConstant.ROOT_DEPT_PID.equals(newEditDeptRequest.getPid())) {
             // 判断部门是否存在
             Dept parentDept = deptMapper.selectOne(new LambdaQueryWrapper<Dept>()
                     .eq(Dept::getTenantId, tenantId)