expert_management.git

			@@ -20,7 +20,6 @@
			import com.ruoyi.common.core.domain.AjaxResult;
			import com.ruoyi.common.core.domain.entity.SysDept;
			import com.ruoyi.common.enums.BusinessType;
			import com.ruoyi.common.utils.SecurityUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.system.service.ISysDeptService;

			@@ -75,6 +74,7 @@
			@GetMapping(value = "/{deptId}")
			public AjaxResult getInfo(@PathVariable Long deptId)
			{
			deptService.checkDeptDataScope(deptId);
			return AjaxResult.success(deptService.selectDeptById(deptId));
			}

			@@ -113,7 +113,7 @@
			{
			return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
			}
			dept.setCreateBy(SecurityUtils.getUsername());
			dept.setCreateBy(getUsername());
			return toAjax(deptService.insertDept(dept));
			}

			@@ -125,20 +125,21 @@
			@PutMapping
			public AjaxResult edit(@Validated @RequestBody SysDept dept)
			{
			Long deptId = dept.getDeptId();
			deptService.checkDeptDataScope(deptId);
			if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
			{
			return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
			}
			else if (dept.getParentId().equals(dept.getDeptId()))
			else if (dept.getParentId().equals(deptId))
			{
			return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
			}
			else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
			&& deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
			else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
			{
			return AjaxResult.error("该部门包含未停用的子部门！");
			}
			dept.setUpdateBy(SecurityUtils.getUsername());
			dept.setUpdateBy(getUsername());
			return toAjax(deptService.updateDept(dept));
			}

			@@ -158,6 +159,7 @@
			{
			return AjaxResult.error("部门存在用户,不允许删除");
			}
			deptService.checkDeptDataScope(deptId);
			return toAjax(deptService.deleteDeptById(deptId));
			}
			}