增加删除接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IOrganizationUserService.java

@@ -12,5 +12,5 @@ public interface IOrganizationUserService {
 
     IPage<OrganizationUser> getListPage(int pageNumber, int pageSize, Long id);
 
-
+    int deleteById(Long id);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/OrganizationService.java

@@ -37,5 +37,5 @@ public interface OrganizationService {
 
     Organization getDetailsById(Long id);
 
-    boolean deleteById(Long id);
+    int deleteById(Long id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrganizationUserController.java

@@ -59,4 +59,11 @@ public class OrganizationUserController extends BaseController {
                                                               @RequestParam(value = "pageSize") int pageSize, @RequestParam() Long id) {
         return ResponseHelper.buildResponse(organizationUserService.getListPage(pageNumber, pageSize, id));
     }
+
+    @GetMapping(value = "/deleteById")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "删除", notes = "根据id删除")
+    public ResponseModel deleteById(@RequestParam() Long id) {
+        return ResponseHelper.buildResponse(organizationUserService.deleteById(id));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrganizationImpl.java

@@ -14,6 +14,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
@@ -89,6 +90,7 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
 
     @Override
     public Organization saveOrganization(Organization organization) {
+        organization.setSort(organizationMapper.selectMaxSort() + 1);
         return this.createWithModel(organization);
     }
 
@@ -149,7 +151,13 @@ public class OrganizationImpl extends BaseService<Organization,Organization, Org
     }
 
     @Override
-    public boolean deleteById(Long id) {
-        return false;
+    public int deleteById(Long id) {
+        LambdaQueryWrapper<OrganizationUser> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(OrganizationUser::getEmergencyTeamId, id);
+        List<OrganizationUser> organizationUsers = organizationUserMapper.selectList(queryWrapper);
+        if (!CollectionUtils.isEmpty(organizationUsers)) {
+            throw new BadRequest("该应急小组下有成员不可删除!");
+        }
+        return this.baseMapper.deleteById(id);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrganizationUserImpl.java

@@ -41,4 +41,9 @@ public class OrganizationUserImpl extends BaseService<OrganizationUser,Organizat
         wrapper.orderByDesc(BaseEntity::getRecDate);
         return this.baseMapper.selectPage(page, wrapper);
     }
+
+    @Override
+    public int deleteById(Long id) {
+        return this.baseMapper.deleteById(id);
+    }
 }