Merge remote-tracking branch 'origin/saas' into saas

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

@@ -165,8 +165,10 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
 
     /**
      * 按id或名称模糊搜索
+     *
+     * @param parentSubjectId 按父Id查询
      * @param search 搜索条件
      * @return 查询结果
      */
-    List<Subject> search(@Param("search") String search);
+    List<Subject> search(@Param("parentSubjectId")Integer parentSubjectId, @Param("search") String search);
 }

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

@@ -108,5 +108,5 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * @param search 搜索条件
      * @return 查询结果
      */
-    List<Subject> search(String search);
+    List<Subject> search(Integer parentSubjectId, String search);
 }

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

@@ -221,7 +221,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
     }
 
     @Override
-    public List<Subject> search(String search) {
-        return  subjectDao.search(search);
+    public List<Subject> search(Integer parentSubjectId, String search) {
+        return  subjectDao.search(parentSubjectId, search);
     }
 }

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

@@ -148,6 +148,9 @@
         SELECT * FROM `subject`
         <where>
             del_flag_ = 0
+            <if test="parentSubjectId != null and parentSubjectId != ''">
+                AND parent_subject_id_ = #{parentSubjectId}
+            </if>
             <if test="search != null and search != ''">
                 AND (id_ = #{search} or name_ like concat('%', #{search}, '%'))
             </if>

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

@@ -103,8 +103,8 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "搜索按Id和名称")
     @GetMapping("/search")
-    @PreAuthorize("@pcs.hasPermissions('subject/search')")
-    public Object search(String search){
-        return succeed(subjectService.search(search));
+    // @PreAuthorize("@pcs.hasPermissions('subject/search')")
+    public Object search(Integer parentSubjectId, String search){
+        return succeed(subjectService.search(parentSubjectId, search));
     }
 }