Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.service.OaUserService;
 import com.ym.mec.oa.OaFeignService;
 import com.ym.mec.oa.entity.OAUser;
 import com.ym.mec.oa.entity.PostDept;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -27,7 +28,9 @@ public class OaServiceImpl implements OaUserService {
         oaUser.setUserName(employee.getRealName());
         oaUser.setNickName(employee.getRealName());
         oaUser.setPhone(employee.getPhone());
-        oaUser.setSex(employee.getGender().toString());
+        if(employee.getGender() != null){
+            oaUser.setSex(employee.getGender().toString());
+        }
         oaUser.setDeptId(employee.getDeptId());
         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
         oaUser.setAvatar(employee.getAvatar());

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

@@ -851,11 +851,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         if(!CollectionUtils.isEmpty(organsVipStudentNumMapList)){
             organsVipStudentNumMap = MapUtil.convertIntegerMap(organsVipStudentNumMapList);
         }
-//        List<Map<Integer, Integer>> organsEVipStudentNumMapList = studentDao.getOrgansEVipStudentNum(organIds);
-//        Map<String, Long> organsEVipStudentNumMap = new HashMap<>();
-//        if(!CollectionUtils.isEmpty(organsEVipStudentNumMapList)){
-//            organsEVipStudentNumMap = MapUtil.convertIntegerMap(organsEVipStudentNumMapList);
-//        }
         List<Map<Integer, Integer>> organCloudStudyStudentNumMapList = studentDao.getOrganCloudStudyStudentNum(organIds);
         Map<String, Long> organCloudStudyStudentNumMap = new HashMap<>();
         if(!CollectionUtils.isEmpty(organCloudStudyStudentNumMapList)){

mec-biz/src/main/resources/config/mybatis/ExtracurricularExercisesMapper.xml

@@ -128,7 +128,7 @@
 		<where>
 			tenant_id_ = #{tenantId}
 			<if test="teacherId!=null">
-				and teacher_id_=#{teacherId}
+				AND teacher_id_ = #{teacherId}
 			</if>
 			<if test="createTime!=null">
 				AND DATE_FORMAT(create_time_, '%Y-%m') = DATE_FORMAT(#{createTime}, '%Y-%m')