Browse Source

单元测试部门所属区域功能。

bruce 2 years ago
parent
commit
14324d626d

+ 3 - 3
imcs-bt-be/imcs-authority-biz/src/main/java/com/github/zuihou/authority/dao/core/OrgRegionMapper.java

@@ -42,8 +42,8 @@ public interface OrgRegionMapper extends SuperMapper<OrgRegion>
     /**
      * 删除组织所属区域
      *
-     * @param id id
+     * @param ids 组织id列表
      */
-    @Delete("DELETE FROM c_core_org_region WHERE org_id = #{id}")
-    void deleteByOrgId(Long id);
+    @Delete("DELETE FROM c_core_org_region WHERE org_id IN (${ids})")
+    void deleteByOrgIds(String ids);
 }

+ 7 - 4
imcs-bt-be/imcs-authority-controller/src/main/java/com/github/zuihou/authority/controller/core/OrgController.java

@@ -75,7 +75,7 @@ public class OrgController extends SuperCacheController<OrgService, Long, Org, O
 
         // 2 保存所属区域
         // 2.1 删除老数据
-        orgRegionMapper.deleteByOrgId(org.getId());
+        orgRegionMapper.deleteByOrgIds(org.getId().toString());
         // 2.2 插入新数据
         String[] regionIds = model.getRegionIds().split(",");
         for (String rId : regionIds)
@@ -103,14 +103,17 @@ public class OrgController extends SuperCacheController<OrgService, Long, Org, O
 
             org.setTreePath(StringUtils.join(parent.getTreePath(), parent.getId(), DEF_ROOT_PATH));
         }
-
     }
 
     @Override
     public R<Boolean> handlerDelete(List<Long> ids)
     {
-        // TODO 删除所属区域
-        return this.success(baseService.remove(ids));
+        // 删除主数据
+        baseService.remove(ids);
+        // 删除所属区域
+        orgRegionMapper.deleteByOrgIds(StringUtils.join(ids, ","));
+
+        return this.success(Boolean.TRUE);
     }
 
     /**