用户修改密码及会计发票查询调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/mapper/xml/CwFinanceInvoiceMapper.xml

@@ -294,7 +294,7 @@
             else '' end
         ) as programName,
 
-        (
+        COALESCE(NULLIF(TRIM(fi.report_type), ''),
         case
                  when a.type = '0' then (fi.report_type)
                  when a.type = '1' then (select rpr.report_type from cw_project_records rpr where id = a.program_id)

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -261,11 +261,12 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
             }
             // 经办人
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getOperator())){
-                queryWrapper.like("su.id", cwFinanceInvoiceDTO.getOperator()).or().like("su.name", cwFinanceInvoiceDTO.getOperator());
+                queryWrapper.and(q -> q.like("su.id", cwFinanceInvoiceDTO.getOperator())
+                        .or().like("su.name", cwFinanceInvoiceDTO.getOperator()));
             }
             //报备类型
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReportType())){
-                queryWrapper.eq("fi.report_type",cwFinanceInvoiceDTO.getReportType()).or(i->i.eq("pr.report_type",cwFinanceInvoiceDTO.getReportType()));
+                queryWrapper.and(q ->q.eq("fi.report_type",cwFinanceInvoiceDTO.getReportType()).or().eq("pr.report_type",cwFinanceInvoiceDTO.getReportType()));
             }
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getName())){
                 queryWrapper.like("fi.name",cwFinanceInvoiceDTO.getName());
@@ -282,7 +283,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
 //                }
 //            }
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReconciliationPeopleName())) {
-                queryWrapper.eq("fi.reconciliation_people",cwFinanceInvoiceDTO.getReconciliationPeopleName()).or().like("su1.name",cwFinanceInvoiceDTO.getReconciliationPeopleName());
+                queryWrapper.and(q ->q.eq("fi.reconciliation_people",cwFinanceInvoiceDTO.getReconciliationPeopleName()).or().like("su1.name",cwFinanceInvoiceDTO.getReconciliationPeopleName()));
             }
             // 经办人部门
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getOperatorOffice())){
@@ -537,14 +538,15 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
             }
             // 经办人
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getOperator())){
-                queryWrapper.like("su.id", cwFinanceInvoiceDTO.getOperator()).or().like("su.name", cwFinanceInvoiceDTO.getOperator());
+                queryWrapper.and(q -> q.like("su.id", cwFinanceInvoiceDTO.getOperator())
+                        .or().like("su.name", cwFinanceInvoiceDTO.getOperator()));
             }
             //报备类型
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReportType())){
                 queryWrapper.eq("fi.report_type",cwFinanceInvoiceDTO.getReportType()).or(i->i.eq("pr.report_type",cwFinanceInvoiceDTO.getReportType()));
             }
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReconciliationPeopleName())) {
-                queryWrapper.eq("fi.reconciliation_people",cwFinanceInvoiceDTO.getReconciliationPeopleName()).or().like("su1.name",cwFinanceInvoiceDTO.getReconciliationPeopleName());
+                queryWrapper.and(q ->q.eq("fi.reconciliation_people",cwFinanceInvoiceDTO.getReconciliationPeopleName()).or().like("su1.name",cwFinanceInvoiceDTO.getReconciliationPeopleName()));
             }
             // 经办人部门
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getOperatorOffice())){

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -1263,8 +1263,8 @@ public class UserController {
             //生成四位随机验证码
             String randomCode = String.valueOf((int) (Math.random() * 9000 + 1000));
             System.out.println(randomCode);
-            redisUtils.setEx(mobile+ "resetPassword", randomCode, 300, TimeUnit.SECONDS);
-            /*HashMap<String,Object> result = null;
+//            redisUtils.setEx(mobile+ "resetPassword", randomCode, 300, TimeUnit.SECONDS);
+            HashMap<String,Object> result = null;
             try{
                 //调用工具类返回结果
                 result = UserUtils.sendRandomCodes(mobile, randomCode);
@@ -1287,7 +1287,7 @@ public class UserController {
                 e.printStackTrace();
                 j.put("success",false);
                 j.put("message","短信发送失败!");
-            }*/
+            }
         } else {
             j.put("success",false);
             j.put("message","当前手机号未注册!请联系管理员");