Merge branch 'dsc' into 'develop'

业务组编辑优化

See merge request 8timerv2/8timerapiv200!165

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

@@ -144,7 +144,9 @@ public class CrmController {
 			CrmSeaRule crmSeaRule = crmBusinessGroup.getCrmSeaRules();
 			CrmSeaRule crmSeaRule = crmBusinessGroup.getCrmSeaRules();
 			crmSeaRule.setGid(gid);
 			crmSeaRule.setGid(gid);
 			crmSeaRule.insert();
 			crmSeaRule.insert();
+			return ResultUtil.success("新增业务组成功");
 		} else {
 		} else {
+			crmBusinessGroup.updateById();
 			List<Integer> memberIds = crmBusinessGroup.getMemberIds();
 			List<Integer> memberIds = crmBusinessGroup.getMemberIds();
 			List<Integer> managerIds = crmBusinessGroup.getManagerIds();
 			List<Integer> managerIds = crmBusinessGroup.getManagerIds();
 			// 更新组成员
 			// 更新组成员
@@ -152,8 +154,9 @@ public class CrmController {
 			updateMembers(orgCode, gid, managerIds, 1);
 			updateMembers(orgCode, gid, managerIds, 1);
 			// 更新公海规则
 			// 更新公海规则
 			crmBusinessGroup.getCrmSeaRules().update(new LambdaQueryWrapper<CrmSeaRule>().eq(CrmSeaRule::getGid, gid));
 			crmBusinessGroup.getCrmSeaRules().update(new LambdaQueryWrapper<CrmSeaRule>().eq(CrmSeaRule::getGid, gid));
+			return ResultUtil.success("编辑业务组成功");
 		}
 		}
-		return ResultUtil.success("新增业务组成功");
+		
 	}
 	}
 
 
 	private void insertMembers(Integer gid, Integer empId, Integer orgCode, Integer type) {
 	private void insertMembers(Integer gid, Integer empId, Integer orgCode, Integer type) {