--no commit message

com.zrqx.fg.member/src/main/java/com/zrqx/bg/member/client/SchoolSysuserClient.java

+package com.zrqx.bg.member.client;
+
+import java.util.List;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.zrqx.core.constant.member.MemberRequestPath;
+import com.zrqx.core.util.response.CallBack;
+
+import io.swagger.annotations.ApiOperation;
+
+@FeignClient(value="school-sysuser",fallback = SchoolSysuserHystric.class)
+public interface SchoolSysuserClient {
+	
+	@ApiOperation(value = "删除专业")
+	@PostMapping(MemberRequestPath.FG + MemberRequestPath.MAJOR + MemberRequestPath.BATCH_DELETE)
+	CallBack<Boolean> batchDelete(@RequestBody List<Integer> ids);
+
+}

com.zrqx.fg.member/src/main/java/com/zrqx/bg/member/client/SchoolSysuserHystric.java

+package com.zrqx.bg.member.client;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.zrqx.core.util.response.CallBack;
+
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
+@Component
+public class SchoolSysuserHystric implements SchoolSysuserClient{
+
+	@Override
+	public CallBack<Boolean> batchDelete(@RequestBody List<Integer> ids) {
+		log.error("远程调用school-sysuser服务删除专业失败");
+		return CallBack.fail();
+	}
+	
+	
+
+}

com.zrqx.fg.member/src/main/java/com/zrqx/bg/member/mapper/departmentmember/FgDepartmentMemberMapper.java

@@ -10,6 +10,7 @@ import com.zrqx.core.form.member.bg.department.QueryDepartmentIdForm;
 import com.zrqx.core.form.member.bg.department.QueryTypeAndRelationIdForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.departmentmember.DepartmentMember;
+import com.zrqx.core.model.member.major.Major;
 import com.zrqx.core.model.member.school.School;
 import com.zrqx.core.vo.member.fg.department.FgDepartmentMemberVo;
 
@@ -111,4 +112,15 @@ public interface FgDepartmentMemberMapper extends BaseMapper<DepartmentMember>{
 	@Select("select s.id from me_department_member s where 1=1 and s.name=#{form.name} and s.relationId=#{form.relationId} LIMIT 1")
 	Integer getId(@Param("form")QueryDepartmentIdForm form);
 	
+	
+	/**
+	 * 查询部门下的专业
+	 * @param departmentId
+	 * @return
+	 * @auther zzg
+	 * @data 2020年1月2日 下午2:40:29
+	 */
+	@Select(" SELECT * from `jgjy-school-sysuser`.me_major where departmentId = #{departmentId} ")
+	List<Major> queryList(Integer departmentId);
+
 }

com.zrqx.fg.member/src/main/java/com/zrqx/bg/member/service/departmentmember/FgDepartmentMemberServiceImpl.java

@@ -17,6 +17,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+
+import com.zrqx.bg.member.client.SchoolSysuserClient;
 import com.zrqx.bg.member.mapper.departmentmember.FgDepartmentMemberMapper;
 import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.enums.BooleanStatusEnum;
@@ -27,12 +29,14 @@ import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.member.bg.department.QueryTypeAndRelationIdForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.departmentmember.DepartmentMember;
+import com.zrqx.core.model.member.major.Major;
 import com.zrqx.core.model.member.member.Member;
 import com.zrqx.core.service.BaseModelServiceImpl;
 import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.excelutil.ExcelUtil;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.member.department.ExcelDepartmentMemberVo;
 import com.zrqx.core.vo.member.department.ImportDepartmentMemberVo;
 import com.zrqx.core.vo.member.department.ImportExcelDepartmentMemberVo;
@@ -48,6 +52,8 @@ public class FgDepartmentMemberServiceImpl extends BaseModelServiceImpl<Departme
 	private Redis redis;
 	@Autowired
 	private FgMemberManage memberManage;
+	@Autowired
+	private SchoolSysuserClient schoolSysuserClient;
 	
 	@Override
 	public BaseMapper<DepartmentMember> getMapper() {
@@ -167,13 +173,25 @@ public class FgDepartmentMemberServiceImpl extends BaseModelServiceImpl<Departme
 	
 	@Override
 	public boolean batchDelete(List<Integer> ids) {
-		boolean bl = super.batchDelete(ids);
+		List<Integer> list = new ArrayList<Integer>();
 		ids.forEach(id -> {
 			// id 为部门id
 			// 根据部门id 删除用户和部门的绑定关系
 			memberManage.updateDepartmentId(id);
+			//删除部门下的专业
+			List<Major> queryList = departmentMapper.queryList(id);
+			if(queryList != null && queryList.size() > 0){
+				queryList.forEach(vo ->{
+					list.add(vo.getId());
 				});
-		return bl;
+			}
+		});
+		//远程调用school-sysuser服务删除专业
+		CallBack<Boolean> callBack = schoolSysuserClient.batchDelete(list);
+		if(callBack == null || callBack.getData() == false){
+			throw new BaseException("删除部门下的专业失败");
+		}
+		return super.batchDelete(ids);
 	}
 	
 	@Override