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

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/EmployeeDto.java

@@ -69,15 +69,35 @@ public class EmployeeDto {
     @ApiModelProperty(value = "社保部门id",required = false)
     private Integer deptId;
 
+    private String deptName;
+
     @ApiModelProperty(value = "OA部门ids",required = false)
     private String deptIds;
 
+    private String deptNames;
+
     @ApiModelProperty(value = "OA岗位ids",required = false)
     private String postIds;
 
     @ApiModelProperty(value = "岗位管理范围",required = false)
     private String postDeptIds;
 
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getDeptNames() {
+        return deptNames;
+    }
+
+    public void setDeptNames(String deptNames) {
+        this.deptNames = deptNames;
+    }
+
     public String getPositionNames() {
         return positionNames;
     }

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

@@ -2,8 +2,6 @@ package com.ym.mec.biz.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.TenantCloudCourseRecordDao;
 import com.ym.mec.biz.dal.entity.TenantCloudCourseRecord;
 import com.ym.mec.biz.dal.vo.TenantCloudCourseRecordVo;
@@ -13,7 +11,6 @@ import com.ym.mec.common.page.PageUtil;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -28,17 +25,12 @@ import java.util.Map;
 @Service("tenantCloudCourseRecordService")
 public class TenantCloudCourseRecordServiceImpl extends ServiceImpl<TenantCloudCourseRecordDao, TenantCloudCourseRecord> implements TenantCloudCourseRecordService {
 
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    private final static Logger logger = LoggerFactory.getLogger(TenantCloudCourseRecordServiceImpl.class);
+    private final static Logger log = LoggerFactory.getLogger(TenantCloudCourseRecordServiceImpl.class);
 
     @Override
     public PageInfo<TenantCloudCourseRecordVo> queryPage(Map<String, Object> param) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        param.put("tenantId", sysUser.getTenantId());
-
         Page<TenantCloudCourseRecordVo> pageInfo = PageUtil.getPageInfo(param);
-        pageInfo.setAsc("a.created_time_");
+        pageInfo.setDesc("a.created_time_");
         param.put("tenantId", TenantContextHolder.getTenantId());
         return PageUtil.pageInfo(baseMapper.queryPage(pageInfo, param));
     }

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

@@ -225,7 +225,9 @@
         <result property="postalCode" column="postal_code_"/>
         <result property="organIdStr" column="organ_id_str_"/>
         <result property="deptId" column="dept_id_"/>
+        <result property="deptName" column="dept_name_"/>
         <result property="deptIds" column="dept_ids_"/>
+        <result property="deptNames" column="dept_names_"/>
         <result property="postIds" column="post_ids_"/>
         <result property="postDeptIds" column="post_dept_ids_"/>
         <collection property="roleNames" ofType="string" javaType="list">
@@ -239,9 +241,11 @@
         SELECT ue.*,ue.organ_id_ organ_id_str_,sr.role_name_,sr.id_ role_id_
         FROM (SELECT e.user_id_,su.real_name_,su.gender_,su.phone_,su.user_type_,e.job_nature_,su.lock_flag_,
         e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,
-                     e.postal_code_,e.dept_id_,e.dept_ids_,e.post_ids_,e.post_dept_ids_
+        e.postal_code_,e.dept_id_,o.name_ dept_name_,e.dept_ids_,GROUP_CONCAT(o1.name_) dept_names_,e.post_ids_,e.post_dept_ids_
         FROM employee e
         LEFT JOIN sys_user su ON e.user_id_ = su.id_
+        LEFT JOIN organization o ON e.dept_id_ = o.id_
+        LEFT JOIN organization o1 ON e.dept_ids_ IS NOT NULL AND JSON_CONTAINS(CAST(e.dept_ids_ AS JSON),CAST(o1.id_ AS JSON))
         <if test="roleId != null">
             LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
         </if>
@@ -269,6 +273,7 @@
                 AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%') or su.id_ like CONCAT('%',#{search},'%'))
             </if>
         </where>
+        GROUP BY e.user_id_
         ORDER BY e.create_time_ DESC <include refid="global.limit"/>) ue
         LEFT JOIN sys_user_role sur ON sur.user_id_ = ue.user_id_
         LEFT JOIN sys_role sr ON sr.id_ = sur.role_id_

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

@@ -43,7 +43,8 @@
 		INSERT INTO teacher_remind (operator_id_,operator_name_,teacher_id_,monday_,content_,type_,create_time_,tenant_id_)
 		VALUE
 		<foreach collection="reminds" item="remind" separator=",">
-			(#{remind.operatorId},#{remind.operatorName},#{remind.teacherId},#{remind.monday},#{remind.content},#{remind.type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(),#{tenantId})
+			(#{remind.operatorId},#{remind.operatorName},#{remind.teacherId},#{remind.monday},#{remind.content},
+		    #{remind.type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(),#{remind.tenantId})
 		</foreach>
 	</insert>