Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -170,7 +170,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param subjectId: 声部编号
      * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
-    List<Teacher> findOrganTeacherBySubject(@Param("organId") Integer organId,
+    List<Teacher> findOrganTeacherBySubject(@Param("organId") String organId,
                                             @Param("subjectId") Integer subjectId);
 
     /**

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

@@ -85,7 +85,7 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param subjectId: 科目编号
      * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
-    List<Teacher> findOrganTeacherBySubject(@Param("organId") Integer organId,
+    List<Teacher> findOrganTeacherBySubject(@Param("organId") String organId,
                                             @Param("subjectId") Integer subjectId);
 
     /**

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

@@ -205,7 +205,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
     }
 
 	@Override
-	public List<Teacher> findOrganTeacherBySubject(Integer organId, Integer subjectId) {
+	public List<Teacher> findOrganTeacherBySubject(String organId, Integer subjectId) {
 		return teacherDao.findOrganTeacherBySubject(organId,subjectId);
 	}
 

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

@@ -481,7 +481,7 @@
         SELECT su.* FROM teacher t
         LEFT JOIN sys_user su on t.id_ = su.id_ WHERE 1=1
         <if test="organId != null">
-            AND t.organ_id_ = #{organId}
+            AND FIND_IN_SET(t.organ_id_,#{organId})
         </if>
         <if test="subjectId != null">
             AND FIND_IN_SET(#{subjectId},t.subject_id_)

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

@@ -48,8 +48,8 @@ public class EmployeeController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(queryInfo.getOrganId())){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
                 }
             }
 		}

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

@@ -105,8 +105,8 @@ public class MusicGroupController extends BaseController {
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.contains(queryInfo.getOrganId())){
-					return failed("用户所在分部异常");
+				if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+					return failed("非法请求");
 				}
 			}
 		}

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

@@ -51,8 +51,8 @@ public class StudentApplyRefundsController extends BaseController {
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.contains(queryInfo.getOrganId())){
-					return failed("用户所在分部异常");
+				if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+					return failed("非法请求");
 				}
 			}
 		}

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

@@ -60,8 +60,8 @@ public class StudentManageController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(queryInfo.getOrganId())){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
                 }
             }
         }

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

@@ -59,8 +59,8 @@ public class StudentPaymentOrderController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(queryInfo.getOrganId())){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
                 }
             }
         }

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

@@ -52,8 +52,8 @@ public class StudentRechargeController extends BaseController {
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.contains(queryInfo.getOrganId())){
-					return failed("用户所在分部异常");
+				if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+					return failed("非法请求");
 				}
 			}
 		}

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

@@ -62,8 +62,8 @@ public class StudentWithdrawController extends BaseController {
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.contains(queryInfo.getOrganId())){
-					return failed("用户所在分部异常");
+				if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+					return failed("非法请求");
 				}
 			}
 		}

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

@@ -60,8 +60,8 @@ public class TeacherController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(queryInfo.getOrganId())){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
                 }
             }
         }
@@ -101,8 +101,8 @@ public class TeacherController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(organId)){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(organId.split(",")))){
+                    return failed("非法请求");
                 }
             }
         }
@@ -114,10 +114,7 @@ public class TeacherController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('teacher/findOrganTeacherBySubject')")
     public HttpResponseResult findOrganTeacherBySubject(Integer subjecId) {
         String organId = sysUserFeignService.queryUserInfo().getOrganId();
-        if(StringUtils.isNotEmpty(organId)){
-            return succeed(teacherService.findOrganTeacherBySubject(Integer.parseInt(organId),subjecId));
-        }
-        return succeed(teacherService.findOrganTeacherBySubject(null,subjecId));
+        return succeed(teacherService.findOrganTeacherBySubject(organId,subjecId));
     }
 
     @ApiOperation(value = "获取乐团所有老师")

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

@@ -63,8 +63,8 @@ public class VipGroupActivityController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(queryInfo.getOrganId())){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
                 }
             }
 		}

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

@@ -56,8 +56,8 @@ public class VipGroupCategoryController extends BaseController {
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.contains(organId)){
-					return failed("用户所在分部异常");
+				if(!list.containsAll(Arrays.asList(organId.split(",")))){
+					return failed("非法请求");
 				}
 			}
 		}

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

@@ -88,8 +88,8 @@ public class VipGroupManageController extends BaseController {
                 return failed("用户所在分部异常");
             }else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.contains(queryInfo.getOrganId())){
-                    return failed("用户所在分部异常");
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
                 }
             }
         }