update

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

@@ -12,5 +12,5 @@ public interface ChargeTypeOrganizationFeeDao extends BaseDAO<Integer, ChargeTyp
      * @param organId
      * @return
      */
-    ChargeTypeOrganizationFee findByOrganId(@Param("chargeTypeId") Integer chargeTypeId, @Param("organId") Integer organId);
+    ChargeTypeOrganizationFee findByOrganId(@Param("chargeTypeId") Integer chargeTypeId, @Param("organId") String organId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SubjectService.java

@@ -36,7 +36,7 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * @param chargeTypeId
      * @return
      */
-    List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId,Integer organId,Integer number);
+    List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId,String organId,Integer number);
 
     /**
      * 通过乐团编号获取声部列表以及声部报名、缴费、计划人数

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

@@ -59,7 +59,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     }
 
     @Override
-    public List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId,Integer organId,Integer number) {
+    public List<Subject> findDefaultSubByChargeTypeId(Integer chargeTypeId,String organId,Integer number) {
         List<Subject> subByChargeTypeId = subjectDao.findDefaultSubByChargeTypeId(chargeTypeId);
         ChargeTypeOrganizationFee byOrganId = chargeTypeOrganizationFeeDao.findByOrganId(chargeTypeId, organId);
         if(byOrganId != null){

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

@@ -75,8 +75,7 @@
 
     <select id="findByOrganId" resultMap="chargeTypeOrganizationFee">
 		SELECT * FROM charge_type_organization_fee ctof
-		WHERE ctof.charge_type_id_ = #{chargeTypeId} AND ctof.organ_id_ = #{organId}
-		ORDER BY ctof.create_time_ DESC
-		LIMIT 1
+		WHERE ctof.charge_type_id_ = #{chargeTypeId} AND FIND_INT_SET(ctof.organ_id_,#{organId})
+		ORDER BY ctof.create_time_ DESC LIMIT 1
 	</select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/SubjectController.java

@@ -63,7 +63,7 @@ public class SubjectController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('subject/findDefaultSubByChargeTypeId')")
     @ApiImplicitParams({ @ApiImplicitParam(name = "chargeTypeId", value = "收费类型编号", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "organId", value = "分部编号", required = true, dataType = "Integer")})
-    public Object findDefaultSubByChargeTypeId(Integer chargeTypeId,Integer organId,Integer number){
+    public Object findDefaultSubByChargeTypeId(Integer chargeTypeId,String organId,Integer number){
         if(chargeTypeId == null || organId == null || number == null){
             throw new BizException("参数校验错误");
         }