Merge branch 'feature/0427-school' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/StudentWrapper.java

@@ -180,6 +180,10 @@ public class StudentWrapper {
         @ApiModelProperty(value = "手机号")
         private String phone;
 
+        @ApiModelProperty(value = "分部id")
+        private Integer organId;
+
+
         @ApiModelProperty(value = "年级")
         private String currentGrade;
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -94,6 +94,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     private StudentMemberUpdateLogDao studentMemberUpdateLogDao;
 
     @Autowired
+    private CooperationOrganService cooperationOrganService;
+
+    @Autowired
     private StudentPlusMapper studentPlusMapper;
 
     @Autowired
@@ -1404,6 +1407,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         if (studentRegister == null) {
             return studentDetail;
         }
+        // 学校分部
+        CooperationOrgan cooperationOrgan = cooperationOrganService.get(queryInfo.getCooperationOrganId());
+        studentDetail.setOrganId(cooperationOrgan.getOrganId());
 
 
         SysUser sysUser = sysUserFeignService.queryUserById(studentDetail.getStudentId());