소스 검색

事项提醒,之前首页展示的是缴费项目数量,现在展示乐团数量。和跳转过去的一致

zouxuan 4 년 전
부모
커밋
1eb7c2d9bd

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -590,7 +590,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		//当前用户是否是分部经理
 //		List<Integer> userRole = employeeDao.queryUserRole(sysUser.getId());
 		//获取关联的乐团列表
-		List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(userRole.contains(3)?sysUser.getId():null,organIdsStr);
+		List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(userRole.contains(4)?sysUser.getId():null,organIdsStr);
 		String configValue1 = sysConfigDao.findConfigValue("push_create_payment_calender");
 		date = new Date();
 		String format = DateUtil.format(date, DateUtil.DEFAULT_PATTERN);

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderMapper.xml

@@ -570,7 +570,7 @@
         SELECT * FROM music_group_payment_calender WHERE id_ = #{calenderId} AND status_ IN ('NO', 'OPEN', 'OVER', 'PAID');
     </select>
     <select id="queryMusicGroupIds" resultType="java.lang.String">
-        SELECT music_group_id_ FROM music_group_payment_calender
+        SELECT DISTINCT music_group_id_ FROM music_group_payment_calender
         WHERE id_ IN
         <foreach collection="calenderIds" item="calenderId" open="(" close=")" separator=",">
             #{calenderId}