update

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

@@ -85,7 +85,6 @@ public class UserController extends BaseController {
 	}
 
 	@ApiOperation(value = "设置密码")
-    @PreAuthorize("@pcs.hasPermissions('user/setPassword')")
 	@PostMapping(value = "/setPassword", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "password", value = "密码", required = true, dataType = "String") })

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentWithdrawDao.java

@@ -3,7 +3,16 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.entity.StudentWithdraw;
 import com.ym.mec.common.dal.BaseDAO;
 
+import java.util.List;
+
 public interface StudentWithdrawDao extends BaseDAO<Integer, StudentWithdraw> {
 
     StudentWithdraw getByUserId(Long userId);
+
+    /**
+     * 根据用户编号列表获取转账信息
+     * @param userIds
+     * @return
+     */
+    List<StudentWithdraw> queryByUserId(Integer userIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SubjectDao.java

@@ -92,7 +92,7 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      * @params [subjectIds]
      * @describe 根据科目编号获取部门编号, 部门名称
      */
-    List<Map<Long, String>> findBySubjecIds(@Param("subjectIds") List<String> subjectIds);
+    List<Map<Long, String>> findBySubjecIds(@Param("subjectIds") String subjectIds);
 
     /**
      * 获取子级列表
@@ -101,7 +101,7 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      */
     List<Subject> findSubSubjects();
 
-    List<Subject> findBySubjectByIdList(@Param("subjectIdList") List<Integer> subjectIdList);
+    List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
 
     /**
      * @describe 获取乐团下对应用户的科目名称

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

@@ -156,11 +156,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (musicGroupSubjectPlans != null) {
             musicGroupSubjectPlanDao.batchAdd(musicGroupSubjectPlans,musicGroupId);
         }
-//        musicGroupSubjectPlans.forEach(e -> {
-//            e.setMusicGroupId(musicGroupId);
-//            musicGroupSubjectPlanDao.insert(e);
-//        });
-
         // 保存乐团声部商品规划
         if (musicGroupSubjectGoodsGroups != null) {
             musicGroupSubjectGoodsGroupDao.batchInsert(musicGroupSubjectGoodsGroups,musicGroupId);

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

@@ -123,6 +123,7 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 		accountDetailPageInfo.getRows().forEach(data -> {
 			WithdrawInfoDto withdrawInfoDto = new WithdrawInfoDto();
 			StudentWithdraw studentWithdraw = studentWithdrawDao.getByUserId(data.getUserId().longValue());
+			List<StudentWithdraw> studentWithdraws = studentWithdrawDao.queryByUserId(data.getUserId());
 			withdrawInfoDto.setWithdrawId(studentWithdraw.getWithdrawNo());
 			withdrawInfoDto.setDateTime(DateUtil.date2ChineseDate(studentWithdraw.getCreateTime()));
 			withdrawInfoDto.setAmount(data.getAmount());

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

@@ -155,7 +155,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
         String[] split = subjectIdsString.split(",");
         List<String> subjectIds=new ArrayList<>(Arrays.asList(split));
         subjectIds = subjectIds.stream().distinct().collect(Collectors.toList());
-        List<Map<Long, String>> bySubjecIds = subjectDao.findBySubjecIds(subjectIds);
+        List<Map<Long, String>> bySubjecIds = subjectDao.findBySubjecIds(StringUtils.join(subjectIds,","));
         Map<Long,String> subjectIdAndName = MapUtil.convertMybatisMap(bySubjecIds);
         return subjectIdAndName;
     }
@@ -167,6 +167,6 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
 
     @Override
     public List<Subject> findBySubjectByIdList(List<Integer> subjectIdList) {
-        return subjectDao.findBySubjectByIdList(subjectIdList);
+        return subjectDao.findBySubjectByIdList(StringUtils.join(subjectIdList,","));
     }
 }

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

@@ -125,4 +125,13 @@
         </where>
         LIMIT 1
     </select>
+    <select id="queryByUserId" resultType="com.ym.mec.biz.dal.entity.StudentWithdraw">
+        SELECT * FROM student_withdraw
+        <where>
+            <if test="userId != null">
+              FIND_IN_SET(user_id_,#{userIds})
+            </if>
+        </where>
+        GROUP BY user_id_
+    </select>
 </mapper>

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

@@ -77,16 +77,18 @@
     <select id="findSubByMusicGroupId" resultMap="Subject">
         SELECT s.* FROM music_group_subject_plan mgsp
         LEFT JOIN `subject` s ON mgsp.subject_id_ = s.id_
-        WHERE mgsp.music_group_id_ = #{musicGroupId}
+        WHERE mgsp.music_group_id_ = #{musicGroupId} AND s.del_flag_ = 0
     </select>
 
     <select id="findSubByChargeType" resultMap="Subject">
-        SELECT s.* FROM charge_type_subject_mapper ctsm LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_ WHERE ctsm.charge_type_id_ = #{chargeTypeId}
+        SELECT s.* FROM charge_type_subject_mapper ctsm
+        LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_
+        WHERE ctsm.charge_type_id_ = #{chargeTypeId} AND s.del_flag_ = 0
     </select>
 
     <!-- 根据科目code查科目 -->
     <select id="findByCode" resultMap="Subject">
-        SELECT * FROM subject WHERE code_ = #{code}
+        SELECT * FROM subject WHERE code_ = #{code} AND del_flag_ = 0
     </select>
     <select id="findByParentId" resultMap="Subject">
         SELECT * FROM subject <include refid="querySubPageSql"/>
@@ -95,7 +97,7 @@
     <select id="findDefaultSubByChargeTypeId" resultMap="Subject">
         SELECT s.* FROM charge_type_subject_mapper ctsm
         LEFT JOIN `subject` s ON subject_id_ = s.id_
-        WHERE ctsm.charge_type_id_ = #{chargeTypeId}
+        WHERE ctsm.charge_type_id_ = #{chargeTypeId} AND s.del_flag_ = 0
     </select>
 
     <resultMap id="subApplyDetail" type="com.ym.mec.biz.dal.dto.SubjectApplyDetailDto">
@@ -110,7 +112,7 @@
         SELECT mgsp.subject_id_,s.name_,mgsp.expected_student_num_,mgsp.apply_student_num_
         FROM music_group_subject_plan mgsp
         LEFT JOIN `subject` s ON mgsp.subject_id_ = s.id_
-        WHERE mgsp.music_group_id_ = #{musicGroupId}
+        WHERE mgsp.music_group_id_ = #{musicGroupId} AND s.del_flag_ = 0
     </select>
     <select id="findBySubIds" resultType="string">
         SELECT name_ FROM `subject` WHERE del_flag_ = 0 AND FIND_IN_SET (id_,#{subIds})
@@ -122,19 +124,16 @@
             WHERE t.id_=#{teacherId} AND s.del_flag_ = 0
     </select>
     <select id="findSubjectConditions" resultType="com.ym.mec.biz.dal.dto.ConditionDto">
-      select id_ id,name_ `name` from subject where parent_subject_id_!=0
+      select id_ id,name_ `name` from subject where parent_subject_id_!=0 AND del_flag_ = 0
     </select>
     <select id="queryNameByIds" resultType="java.util.Map">
-        select id_ `key`,name_ `value` FROM `subject` s WHERE FIND_IN_SET(s.id_,#{subjectIds})
+        select id_ `key`,name_ `value` FROM `subject` s WHERE FIND_IN_SET(s.id_,#{subjectIds}) AND s.del_flag_ = 0
     </select>
     <select id="findBySubjecIds" resultType="java.util.Map">
-        select id_ `key`,name_ `value` FROM `subject` s WHERE s.id_ IN
-        <foreach collection="subjectIds" item="subjectId" open="(" close=")" separator=",">
-            #{subjectId}
-        </foreach>
+        select id_ `key`,name_ `value` FROM `subject` s WHERE FIND_IN_SET(s.id_,#{subjectIds}) AND s.del_flag_ = 0
     </select>
     <select id="findSubSubjects" resultMap="Subject">
-        SELECT * FROM `subject` WHERE parent_subject_id_ != 0
+        SELECT * FROM `subject` WHERE parent_subject_id_ != 0 AND del_flag_ = 0
     </select>
 
     <sql id="querySubPageSql">
@@ -149,10 +148,7 @@
     </sql>
 
     <select id="findBySubjectByIdList" resultMap="Subject">
-        SELECT * FROM `subject` WHERE id_ IN
-        <foreach collection="subjectIdList" item="subjectId" open="(" close=")" separator=",">
-            #{subjectId}
-        </foreach>
+        SELECT * FROM `subject` WHERE del_flag_ = 0 AND FIND_IN_SET(id_,#{subjectIdList})
     </select>
 
     <select id="findByMusicGroupAndUsers" resultType="map">
@@ -162,7 +158,7 @@
         FROM
             student_registration sr
             LEFT JOIN `subject` s ON sr.actual_subject_id_=s.id_
-            WHERE sr.music_group_id_=#{musicGroupId}
+            WHERE sr.music_group_id_=#{musicGroupId} AND s.del_flag_ = 0
             AND sr.user_id_ IN
             <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
                 #{userId}

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

@@ -202,7 +202,7 @@
         t.job_nature_,t.is_probation_period_,GROUP_CONCAT(s.name_) subject_name_
         FROM teacher t LEFT JOIN sys_user su ON t.id_ = su.id_
         LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
-        WHERE su.user_type_ LIKE '%TEACHER%' AND su.del_flag_ = 0
+        WHERE su.del_flag_ = 0
         <include refid="queryPageMap"/>
         GROUP BY t.id_
         <include refid="global.limit"/>

mec-im/src/main/java/com/ym/service/Impl/UserServiceImpl.java

@@ -39,17 +39,6 @@ public class UserServiceImpl implements UserService {
     @Autowired
     IMHelper imHelper;
 
-//    @Override
-//    public String refreshToken(String userId, String name) throws ApiException, Exception  {
-//        log.info("request token: {}, {}", userId, name);
-//        IMTokenInfo tokenInfo = imHelper.getToken(userId, name, "");
-//        if (tokenInfo.isSuccess()) {
-//            return tokenInfo.getAuthenticationValue();
-//        } else {
-//            throw new ApiException(ErrorEnum.ERR_IM_TOKEN_ERROR, tokenInfo.getErrorMessage());
-//        }
-//    }
-
     private User getUser(){
         RongCloud rongCloud = RongCloud.getInstance(appKey, appSecret);
         return rongCloud.user;