bug修复

src/main/java/com/xjrsoft/module/base/service/impl/WhitelistManagementServiceImpl.java

@@ -265,7 +265,7 @@ public class WhitelistManagementServiceImpl extends MPJBaseServiceImpl<Whitelist
             }else{
                 User parent = new User();
                 parent.setId(parentId);
-                parent.setPassword(BCrypt.hashpw(propertiesConfig.getDefaultPassword(), BCrypt.gensalt()));
+                parent.setPassword(BCrypt.hashpw(vo.get(4).toString(), BCrypt.gensalt()));
                 parent.setCreateDate(now);
                 parent.setMobile(vo.get(4).toString());
                 parent.setName(vo.get(3).toString());

src/main/resources/mapper/base/BaseClass.xml

@@ -69,7 +69,7 @@
             and t1.code like concat('%', #{dto.code}, '%')
         </if>
         <if test="dto.enrollType != null and dto.enrollType != ''">
-            and t1.enroll_type = #{dto.enroll_type}
+            and t1.enroll_type = #{dto.enrollType}
         </if>
     </select>
 

src/main/resources/mapper/base/BaseClassCourse.xml

@@ -35,7 +35,7 @@
         LEFT JOIN xjr_department t4 ON t4.id = t.org_id
         WHERE t.delete_mark = 0
         <if test="dto.className != null and dto.className != ''">
-            and t.name = like concat('%', #{dto.className}, '%')
+            and t.name like concat('%', #{dto.className}, '%')
         </if>
         <if test="dto.deptId != null">
             and t4.id = #{dto.deptId}

src/main/resources/mapper/student/PbVXsxxsfytbMapper.xml

@@ -55,7 +55,7 @@
         GROUP BY t2.name
     </select>
     <select id="stduyStatusStat" parameterType="com.xjrsoft.module.student.dto.PbVXsxxsfytbStatDto" resultType="com.xjrsoft.module.student.vo.StringCountVo">
-        SELECT t2.name,COUNT(t1.credential_number) as count FROM xjr_user t1
+        SELECT replace(t2.name,'住校','住读'),COUNT(t1.credential_number) as count FROM xjr_user t1
         INNER JOIN base_student_school_roll t3 ON t1.id = t3.user_id
         left JOIN xjr_dictionary_detail t2 ON t3.stduy_status = t2.code and t2.item_id = 2023000000000000030
         WHERE t3.delete_mark = 0