调整机构编辑

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -81,9 +81,9 @@ public class SysDeptController extends BaseController {
     @Log(title = "机构管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysOrg dept) {
-        /*if (orgService.list(new QueryWrapper<SysOrg>().eq("name", dept.getName())).size() > 0) {
+       if (orgService.list(new QueryWrapper<SysOrg>().eq("name", dept.getName())).size() > 0) {
             return error("新增机构'" + dept.getName() + "'失败，机构名称已存在");
-        }*/
+        }
         dept.setCreateBy(SecurityUtils.getUsername());
         dept.setCreateTime(new Date());
         dept.setSource(0);
@@ -99,14 +99,14 @@ public class SysDeptController extends BaseController {
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysOrg dept) {
         Long deptId = dept.getId();
-        /*QueryWrapper<SysOrg> qw = new QueryWrapper<SysOrg>()
+        QueryWrapper<SysOrg> qw = new QueryWrapper<SysOrg>()
                 .eq("name", dept.getName())
                 .ne("id",dept.getId())
                 .eq("deleted", 0L);
         List<SysOrg> list = orgService.list(qw);
-        if (list.size() > 1) {
+        if (list.size() > 0) {
             return error("修改机构'" + dept.getName() + "'失败，机构名称已存在");
-        } */
+        }
 
         if (dept.getParentId().equals(deptId)) {
             return error("修改机构'" + dept.getName() + "'失败，上级机构不能是自己");