浏览代码

删除分组

mxd 4 年之前
父节点
当前提交
a559d8dbb4

+ 3 - 2
src/main/java/org/ssssssss/magicapi/config/MagicGroupController.java

@@ -34,11 +34,12 @@ public class MagicGroupController extends MagicController {
 			return new JsonBean<>(-10, "无权限执行删除方法");
 		}
 		try {
-			boolean success = configuration.getMagicApiService().deleteGroup(groupId) && this.groupServiceProvider.delete(groupId);
+			boolean success = configuration.getMagicApiService().deleteGroup(groupId);
 			if (success) {    //删除成功时取消注册
 				configuration.getMappingHandlerMapping().deleteGroup(groupId);
 			}
-			return new JsonBean<>(success);
+			// 删除分组
+			return new JsonBean<>(this.groupServiceProvider.delete(groupId));
 		} catch (Exception e) {
 			logger.error("删除分组出错", e);
 			return new JsonBean<>(-1, e.getMessage());

+ 1 - 1
src/main/java/org/ssssssss/magicapi/provider/impl/DefaultApiServiceProvider.java

@@ -67,7 +67,7 @@ public class DefaultApiServiceProvider extends BeanPropertyRowMapper<ApiInfo> im
 
 	@Override
 	public boolean deleteGroup(String groupId) {
-		return template.update("delete from magic_api_info where api_group_id = ?", groupId) > 0;
+		return template.update("delete from magic_api_info where api_group_id = ?", groupId) >= 0;
 	}
 
 	public boolean exists(String groupId, String method, String path) {

+ 1 - 1
src/main/java/org/ssssssss/magicapi/provider/impl/DefaultGroupServiceProvider.java

@@ -36,7 +36,7 @@ public class DefaultGroupServiceProvider extends BeanPropertyRowMapper<Group> im
 
 	@Override
 	public boolean delete(String groupId) {
-		String deleteByGroupId = "delete from magic_api_info where api_group_id = ?";
+		String deleteByGroupId = "delete from magic_group where id = ?";
 		return template.update(deleteByGroupId, groupId) > 0;
 	}