--no commit message

app/member/src/main/java/com/zrqx/member/bg/organ/controller/OrganController.java

@@ -24,11 +24,17 @@ import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.member.bg.member.service.MemberService;
+import com.zrqx.member.bg.omember.service.OrganMemberService;
 import com.zrqx.member.bg.organ.service.OrganService;
+import com.zrqx.member.bg.pmember.service.PersonalMemberService;
 import com.zrqx.member.commons.form.bg.organ.QueryOrganForm;
 import com.zrqx.member.commons.form.bg.organ.SaveOrUpdateOrganForm;
 import com.zrqx.member.commons.form.bg.resource.SaveDiyTypeForm;
+import com.zrqx.member.commons.model.Member;
 import com.zrqx.member.commons.model.Organ;
+import com.zrqx.member.commons.model.OrganMember;
+import com.zrqx.member.commons.model.PersonalMember;
 import com.zrqx.member.commons.vo.bg.organ.OrganVO;
 import com.zrqx.member.commons.vo.bg.resource.DiyTypeOneVO;
 
@@ -46,6 +52,12 @@ public class OrganController {
 	@Autowired
 	private OrganService service;
 	@Autowired
+	private MemberService memberService;
+	@Autowired
+	private PersonalMemberService personalMemberService;
+	@Autowired
+	private OrganMemberService organMemberService;
+	@Autowired
 	private Redis redis;
 			
 	@ApiOperation(value = "保存", notes = "无id新增,有id更新")
@@ -80,6 +92,17 @@ public class OrganController {
 		if (!service.deleteByPrimaryKey(oid)) {
 			throw new BaseException(ResponseCodeEnum.FAIL);
 		}
+		Example example = new Example(OrganMember.class);
+		example.createCriteria().andEqualTo("oid", oid);
+		List<OrganMember> list = organMemberService.selectByExample(example);
+		List<Integer> memberIds =  list.stream().map(OrganMember :: getId).collect(Collectors.toList());
+		organMemberService.deleteByExample(example);
+		example = new Example(Member.class);
+		example.createCriteria().andIn("id", memberIds);
+		memberService.deleteByExample(example);
+		example = new Example(PersonalMember.class);
+		example.createCriteria().andIn("id", memberIds);
+		personalMemberService.deleteByExample(example);
 		return CallBack.success(true);
 	}
 	@ApiOperation(value = "检查机构码是否已存在", notes = "检查机构码是否已存在")