Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/ResourceServerConfig.java

@@ -26,7 +26,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
 		http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and()
-				.authorizeRequests().antMatchers("/task/**").hasIpAddress("0.0.0.0/0").anyRequest().authenticated().and().httpBasic();
+				.authorizeRequests().antMatchers("/task/**","/user/updatePassword").hasIpAddress("0.0.0.0/0").anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -129,11 +129,7 @@ public class UserController extends BaseController {
 		if (StringUtils.isEmpty(mobile) || StringUtils.isEmpty(authCode) || StringUtils.isEmpty(newPassword)) {
 			return failed("参数校验异常");
 		}
-		AuthUser authUser = SecurityUtils.getUser();
-		if (authUser == null) {
-			return failed("获取用户信息失败");
-		}
-		SysUser sysUser = sysUserService.get(authUser.getUserId());
+		SysUser sysUser = sysUserService.queryByPhone(mobile);
 		if (sysUser == null) {
 			return failed("用户不存在");
 		}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CourseHomeworkQueryInfo.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -17,12 +18,23 @@ public class CourseHomeworkQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "乐团ID",required = false)
     private Long musicGroupId;
 
+    @ApiModelProperty(value = "课程组类型", required = false)
+    private GroupType groupType;
+
     @ApiModelProperty(value = "班级ID",required = false)
     private Long classGroupId;
 
     @ApiModelProperty(value = "用户ID",required = false)
     private Long userId;
 
+    public GroupType getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(GroupType groupType) {
+        this.groupType = groupType;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }

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

@@ -2093,10 +2093,14 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 Map<Long, String> subjectNames = MapUtil.convertMybatisMap(subjectDao.findBySubjecIds(StringUtils.join(subjectIds, ",")));
                 Map<Integer, String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMapList(organIds));
 
-                List<SimpleUserDto> educationalUsers = employeeDao.findByIds(educationalTeacherIds);
-                Map<Integer, String> idNameMap = educationalUsers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, user -> user.getUserName()));
+                Map<Integer, String> idNameMap=new HashMap<>();
+                if(!CollectionUtils.isEmpty(educationalTeacherIds)){
+                    List<SimpleUserDto> educationalUsers = employeeDao.findByIds(educationalTeacherIds);
+                    idNameMap = educationalUsers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, user -> user.getUserName()));
+                }
 
-                dataList.forEach(e -> {
+
+                for (PracticeGroupDto e : dataList) {
                     e.setSubjectName(subjectNames.get(e.getSubjectId().intValue()));
                     e.setOrganName(organNames.get(e.getOrganId()));
                     ClassGroup classGroup = vipGroupClassGroupMap.get(e.getId().toString());
@@ -2108,7 +2112,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     Long aLong1 = currentClassTimeMap.get(e.getId() + "");
                     e.setCurrentClassTimes(aLong1 == null ? 0 : aLong1.intValue());
                     e.setEducationalTeacherName(idNameMap.get(e.getEducationalTeacherId()));
-                });
+                }
             }
         }
         if (count == 0) {

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

@@ -581,10 +581,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				Map<String,Long> totalClassTimeMap = MapUtil.convertIntegerMap(courseScheduleDao.countTotalCourseScheduleNum(vipGroupIds,"VIP"));
 				Map<String,Long> currentClassTimeMap = MapUtil.convertIntegerMap(courseScheduleDao.countCourseScheduleNum(vipGroupIds,"VIP"));
 
-				List<SimpleUserDto> educationalUsers = employeeDao.findByIds(educationalTeacherIds);
-				Map<Integer, String> idNameMap = educationalUsers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, user -> user.getUserName()));
+				Map<Integer, String> idNameMap=new HashMap<>();
+				if(!CollectionUtils.isEmpty(educationalTeacherIds)){
+					List<SimpleUserDto> educationalUsers = employeeDao.findByIds(educationalTeacherIds);
+					idNameMap = educationalUsers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, user -> user.getUserName()));
+				}
 
-				dataList.forEach(vipGroup -> {
+				for (VipGroup vipGroup : dataList) {
 					Integer overCourses = vipGroupOverCourseMaps.get(vipGroup.getId().toString());
 					ClassGroup classGroup = vipGroupClassGroupMap.get(vipGroup.getId().toString());
 					if(Objects.nonNull(classGroup)){
@@ -611,7 +614,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 							vipGroup.setMonthConsumeRate(monthConsumeRate * 100);
 						}
 					}
-				});
+				}
 			}
 		}
 		if (count == 0) {

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

@@ -407,6 +407,7 @@
         <if test="search != null">
             AND cg.name_ LIKE CONCAT('%',#{search},'%')
         </if>
+        GROUP BY cg.id_
     </select>
 
     <select id="findNoClassSubjects" resultMap="ClassGroup">

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

@@ -143,13 +143,15 @@
     <sql id="queryCondition">
         <where>
             (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-            AND cg.group_type_ = 'MUSIC'
             <if test="createTime != null">
                 AND DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
             </if>
             <if test="musicGroupId != null">
                 AND cg.music_group_id_ = #{musicGroupId}
             </if>
+            <if test="groupType!=null">
+                AND cg.group_type_= #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
             <if test="classGroupId != null">
                 AND ch.class_group_id_ = #{classGroupId}
             </if>