Browse Source

1、修复验证密码错误的接口
2、调整收费查询逻辑

dzx 10 months ago
parent
commit
e9ff9fc70e

+ 2 - 2
src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -669,10 +669,10 @@ public class UserController {
 
     @GetMapping("/check-password")
     @ApiOperation(value = "验证登录者的密码")
-    public RT<Boolean> checkSignpassword(@Valid @RequestBody UploadSignDto dto) {
+    public RT<Boolean> checkSignpassword(@Valid @RequestParam String password) {
         long loginIdAsLong = StpUtil.getLoginIdAsLong();
         User user = userService.getById(loginIdAsLong);
-        if (!BCrypt.checkpw(dto.getPassword(), user.getSignPassword())) {
+        if (!BCrypt.checkpw(password, user.getSignPassword())) {
             return RT.error("密码填写错误!");
         }
         return RT.ok(true);

+ 3 - 3
src/main/resources/mapper/student/BaseStudentSchoolRollMapper.xml

@@ -99,9 +99,9 @@
                t3.stduy_status                                                                                               as stduyStatusCode,
                t3.roll_modality                                                                                              as rollModalityCode,
                 t12.name AS student_form,
-               replace(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode LIKE '999010604%' AND beltcode = #{dto.beltcode}),'欠费'),'未缴费','欠费') AS jxf,
-               replace(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode = 103042766003001 AND beltcode = #{dto.beltcode}),'欠费'),'未缴费','欠费') AS ssf,
-               replace(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode LIKE '999010603%' AND beltcode = #{dto.beltcode}),'欠费'),'未缴费','欠费') AS jcf,
+               REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode LIKE '999010604%' AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS jxf,
+               REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode = 103042766003001 AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS ssf,
+               REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode LIKE '999010603%' AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS jcf,
                CONCAT(t17.name, ' ', t16.room_name, ' ', t15.bed_number) AS bed_info
         FROM base_student t1
                  INNER JOIN xjr_user t2 ON t1.user_id = t2.id