Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

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

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -438,7 +438,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         task.setCycle(plan.getPlanCycle());
         task.setOrgId(sysOrg.getId());
         task.setOrgPath(sysOrg.getPath());
-        task.setOrgName(sysOrg.getName());
+        task.setOrgName(sysOrg.getShortName());
         task.setBatchNum(batchNum);
         task.setPlanId(plan.getId());
         task.setOrderNum(frequency);

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() + "'失败，机构名称已存在");
-        }*/
+        }
         if(ObjectUtil.isEmpty(dept.getShortName())){
             dept.setShortName(dept.getName());
         }
@@ -102,14 +102,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() + "'失败，上级机构不能是自己");

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDeptServiceImpl.java

@@ -133,7 +133,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             orgs.add(org);
         }
         if (dept.getRemoveId() != null) {
-            orgs.removeIf(d -> d.getId().equals(dept.getRemoveId()));
+            orgs.removeIf(d -> d.getTreeShowPath().endsWith(dept.getId()+"-"));
         }
         return generateTree(orgs, sysOrg);
     }