1.调整用户档案模块查询条件

2.调整报停、销户、恢复空指针报错

collect_fees_hdx_api/fees-hdx-api/src/main/java/com/tofly/feesapi/yhgl/controller/YhBtLogController.java

@@ -132,7 +132,7 @@ public class YhBtLogController {
         String cbkid = daBtLog.getCbkid();
 
         if (StringUtil.isNotEmpty(yhbh)) {
-            if (daBtLog.getSfyzqf().equals("1")) {
+            if (daBtLog != null && "1".equals(daBtLog.getSfyzqf())) {
                 //判断用户是否存在欠费
                 int count = yyQfmxMapper.selectExistQf(yhbh);
                 if (count > 0) {

collect_fees_hdx_api/fees-hdx-api/src/main/java/com/tofly/feesapi/yhgl/controller/YhGhLogController.java

@@ -139,7 +139,7 @@ public class YhGhLogController {
             return ResultRespone.failed(false, "操作失败,用户编号不能为空");
         }
 
-        if (yzqf.equals("1")) {
+        if (yzqf != null && yzqf.equals("1")) {
             //判断用户是否存在欠费
             int count = yyQfmxMapper.selectExistQf(yhbh);
             if (count > 0) {

collect_fees_hdx_api/fees-hdx-api/src/main/java/com/tofly/feesapi/yhgl/controller/YhHfysLogController.java

@@ -115,7 +115,7 @@ public class YhHfysLogController {
 
         ResultRespone<Object> rest = new ResultRespone<>();
         if (StringUtils.isNotBlank(yhHfysLog.getYhbh())) {
-            if (yzqf.equals("1")) {
+            if (yzqf != null && yzqf.equals("1")){
                 //判断用户是否存在欠费
                 int count = yyQfmxMapper.selectExistQf(yhHfysLog.getYhbh());
 

collect_fees_hdx_api/fees-hdx-api/src/main/resources/mapper/yhgl/YhKhjbxxMapper.xml

@@ -322,7 +322,7 @@
         <!--模糊查询 -->
         <if test="filter.searchText != null and filter.searchText != ''">
             AND (
-            UPPER(a.yhbh) like UPPER('%${filter.searchText}%')
+            a.yhbh like '%${filter.searchText}%'
             OR a.yhxm like '%${filter.searchText}%'
             OR a.yhdz like '%${filter.searchText}%'
             OR a.lxdh like '%${filter.searchText}%'
@@ -454,9 +454,9 @@
         <if test="filter.dxh != null">
             AND a.dxh = #{filter.dxh}
         </if>
-        <if test="filter.userId != null">
-            AND a.sscbb in(select cbbbm from yh_sjqx where user_id=#{filter.userId})
-        </if>
+<!--        <if test="filter.userId != null">-->
+<!--            AND a.sscbb in(select cbbbm from yh_sjqx where user_id=#{filter.userId})-->
+<!--        </if>-->
         ORDER BY a.yhbh asc
         <!--        <if test="filter.jdrqdxpx != null and filter.jdrqdxpx == 1">-->
         <!--            ORDER BY jdrq DESC NULLS LAST-->

collect_fees_hdx_api/fees-hdx-api/target/classes/mapper/yhgl/YhKhjbxxMapper.xml

@@ -322,7 +322,7 @@
         <!--模糊查询 -->
         <if test="filter.searchText != null and filter.searchText != ''">
             AND (
-            UPPER(a.yhbh) like UPPER('%${filter.searchText}%')
+            a.yhbh like '%${filter.searchText}%'
             OR a.yhxm like '%${filter.searchText}%'
             OR a.yhdz like '%${filter.searchText}%'
             OR a.lxdh like '%${filter.searchText}%'
@@ -454,9 +454,9 @@
         <if test="filter.dxh != null">
             AND a.dxh = #{filter.dxh}
         </if>
-        <if test="filter.userId != null">
-            AND a.sscbb in(select cbbbm from yh_sjqx where user_id=#{filter.userId})
-        </if>
+<!--        <if test="filter.userId != null">-->
+<!--            AND a.sscbb in(select cbbbm from yh_sjqx where user_id=#{filter.userId})-->
+<!--        </if>-->
         ORDER BY a.yhbh asc
         <!--        <if test="filter.jdrqdxpx != null and filter.jdrqdxpx == 1">-->
         <!--            ORDER BY jdrq DESC NULLS LAST-->