//BUG 2761 判断人员删除时的逻辑 如果被选为队伍联系人则无法被删除 bykongfm

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

@@ -6,6 +6,8 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
@@ -81,6 +83,8 @@ public class FirefightersController extends BaseController {
 	@Autowired
 	FirefightersJacketServiceImpl iFirefightersJacketService;
 	@Autowired
+	FireTeamServiceImpl iFireTeamService;
+	@Autowired
 	RedisUtils redisUtils;
 	@Value("${redis.cache.failure.time}")
 	private long time;
@@ -116,6 +120,11 @@ public class FirefightersController extends BaseController {
 	@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
 	@Transactional
 	public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable Long id) {
+		//BUG 2761 判断人员删除时的逻辑 如果被选为队伍联系人则无法被删除 bykongfm
+		List fireTeam = iFireTeamService.list(new LambdaQueryWrapper<FireTeam>().eq(FireTeam::getIsDelete,false).eq(FireTeam::getContactUserId,id));
+		if(fireTeam.size() > 0 ) {
+			return ResponseHelper.buildResponse("-1");
+		}
 		QueryWrapper<FirefightersJacket> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("firefighters_id", id);
 		queryWrapper.eq("is_delete", 0);
@@ -139,7 +148,7 @@ public class FirefightersController extends BaseController {
 					.update(new UpdateWrapper<FirefightersJacket>().eq("firefighters_id", id).set("is_delete", 1));
 			// 删除缓存
 			redisUtils.del(RedisKey.FIREFIGHTERS_ID + id, RedisKey.FIREFIGHTERS_LIST_ID + id);
-			return ResponseHelper.buildResponse(null);
+			return ResponseHelper.buildResponse("0");
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new RuntimeException("删除失败！");