Merge branch 'dsc' into 'develop'

添加删除客户联系人 容错

See merge request 8timerv2/8timerapiv200!170

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -563,13 +563,18 @@ public class CrmController {
 	@ApiOperation(value = "新增/编辑客户联系人", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperation(value = "新增/编辑客户联系人", httpMethod = "POST", notes = "接口发布说明")
 	public Result<Void> addCilentLinkMan(@CurrentUser UserBean userBean,
 	public Result<Void> addCilentLinkMan(@CurrentUser UserBean userBean,
 			@RequestBody CrmClientContacts crmClientContacts) {
 			@RequestBody CrmClientContacts crmClientContacts) {
+		Integer cid = crmClientContacts.getCid();
+
 		if (crmClientContacts.getId() == null) {
 		if (crmClientContacts.getId() == null) {
+			if (cid == null)
+				return ResultUtil.error("编辑失败,请传入客户id");
+
 			Integer num = CrmClientData.builder().id(crmClientContacts.getCid()).build().selectById().getContactsNum();
 			Integer num = CrmClientData.builder().id(crmClientContacts.getCid()).build().selectById().getContactsNum();
-			CrmClientData.builder().id(crmClientContacts.getCid()).contactsNum(++num).build().updateById();
+			CrmClientData.builder().id(cid).contactsNum(++num).build().updateById();
 		}
 		}
 		if (crmClientContacts.insertOrUpdate())
 		if (crmClientContacts.insertOrUpdate())
 			return ResultUtil.success("新增/编辑成功");
 			return ResultUtil.success("新增/编辑成功");
-		return ResultUtil.success("新增/编辑失败");
+		return ResultUtil.error("新增/编辑失败");
 
 
 	}
 	}
 
 
@@ -577,7 +582,10 @@ public class CrmController {
 	@Transactional
 	@Transactional
 	@ApiOperation(value = "删除客户联系人", httpMethod = "DELETE", notes = "接口发布说明")
 	@ApiOperation(value = "删除客户联系人", httpMethod = "DELETE", notes = "接口发布说明")
 	public Result<Void> delCilentLinkMan(@CurrentUser UserBean userBean, CrmClientContacts crmClientContacts) {
 	public Result<Void> delCilentLinkMan(@CurrentUser UserBean userBean, CrmClientContacts crmClientContacts) {
-		Integer num = CrmClientData.builder().build().selectById().getContactsNum();
+		Integer cid = crmClientContacts.getCid();
+		if (cid == null)
+			return ResultUtil.error("编辑失败,请传入客户id");
+		Integer num = CrmClientData.builder().id(cid).build().selectById().getContactsNum();
 		CrmClientData.builder().id(crmClientContacts.getCid()).contactsNum(--num).build().updateById();
 		CrmClientData.builder().id(crmClientContacts.getCid()).contactsNum(--num).build().updateById();
 		if (crmClientContacts.deleteById())
 		if (crmClientContacts.deleteById())
 			return ResultUtil.success("删除成功");
 			return ResultUtil.success("删除成功");