Browse Source

feat:协议,优化

Joburgess 4 năm trước cách đây
mục cha
commit
e5da2310e3

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -116,6 +116,9 @@ public class StudentManageServiceImpl implements StudentManageService {
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
 
+        String[] organIds = queryInfo.getOrganId().split(",");
+        params.put("organIds", organIds);
+
         List<StudentManageListDto> dataList = null;
         int count = studentManageDao.countStudentByOrganId(params);
         if (count > 0) {

+ 1 - 0
mec-biz/src/main/resources/config/contracts/product2.ftl

@@ -33,6 +33,7 @@
         h1 {
             font-size: 16px;
             text-align: center;
+            margin-bottom: 8px;
         }
         h2 {
             font-size: 16px;

+ 5 - 2
mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -168,8 +168,11 @@
     <sql id="findStudentsByOrganIdSql">
         <where>
                 su.del_flag_ = 0
-            <if test="organId != null and organId != ''">
-                AND FIND_IN_SET(su.organ_id_,#{organId})
+            <if test="organIds != null and organIds.length>0">
+                AND su.organ_id_ IN
+                <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
+                    #{organId}
+                </foreach>
             </if>
             <if test="search != null and search != ''">
                 AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.id_ LIKE CONCAT('%',#{search},'%'))