Merge remote-tracking branch 'origin/master'

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

@@ -14,12 +14,12 @@ import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.enums.EmployeeOperateEnum;
 import com.ym.mec.biz.dal.enums.ParamEnum;
 import com.ym.mec.biz.dal.page.EmployeeQueryInfo;
-import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.biz.service.EmployeeService;
 import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
@@ -70,8 +70,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 				employeeDao.insert(employee);
 				//新增用户角色
 				employeeDao.batchAddEmployeeRole(user.getId(),employee.getRoleIds());
+			}else{
+				new BizException("员工已存在");
 			}
-			return;
 		}
 		employee.setPassword(new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
 		employee.setUserType(SysUserType.SYSTEM);
@@ -94,11 +95,16 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	public void updateEmployee(Employee employee) {
 		Employee employee1 = employeeDao.get(employee.getId());
 		if(null==employee1){
-			employeeDao.insert(employee);
-		}else{
-			employee.setUserId(employee.getId());
-			employeeDao.update(employee);
+			throw new BizException("员工信息不存在");
 		}
+		employee.setUserId(employee.getId());
+		if(StringUtils.isNotEmpty(employee.getPhone())){
+			SysUser sysUser = sysUserFeignService.queryUserByMobile(employee.getPhone());
+			if(sysUser != null && !sysUser.getId().equals(employee.getUserId())){
+				throw new BizException("手机号已存在");
+			}
+		}
+		employeeDao.update(employee);
 		//删除当前用户角色
 		employeeDao.delEmployeeRole(employee.getId());
 		//新增用户角色

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

@@ -633,8 +633,7 @@
         <if test="type!=null and type!=''">
             AND cs.type_=#{type}
         </if>
-        GROUP BY
-        cs.class_date_
+        GROUP BY cs.class_date_
     </select>
 
     <select id="getCourseScheduleDate" resultType="java.util.Date">

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

@@ -305,7 +305,7 @@
 		SELECT cg.music_group_id_ `key`,COUNT(cgsm.id_) `value` FROM class_group cg
 		LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
 		WHERE FIND_IN_SET(cg.music_group_id_,#{musicGroupIds})
-		AND cgsm.status_ != 'QUIT' GROUP BY cg.music_group_id_
+		AND cgsm.status_ != 'QUIT' AND cg.type_ != 'MIX' GROUP BY cg.music_group_id_
 	</select>
 
     <select id="queryListByIds" resultMap="MusicGroup" parameterType="list">