Merge remote-tracking branch 'origin/master'

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/service/impl/HlgPaymentServiceImpl.java

@@ -766,14 +766,15 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
 
     /**
      * 去特殊空格
+     *
      * @param str
      * @return
      */
-    public String trimString(String str){
-        String result="";
-        if(StringUtils.isNotBlank(str)){
+    public String trimString(String str) {
+        String result = "";
+        if (StringUtils.isNotBlank(str)) {
             //去掉ascll码160空格 + 去掉前后空格
-            result = str.trim().replaceAll("\\u00A0","");
+            result = str.trim().replaceAll("\\u00A0", "");
             //去除字符串中头部和尾部所包含的空格（包括:空格(全角，半角)、制表符、换页符等）
             result = result.replaceAll("^[　*| *| *|//s*]*", "").replaceAll("[　*| *| *|//s*]*$", "");
         }
@@ -951,7 +952,7 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
                 //循环找出重复项只报重复错误
                 if (list1.size() > 0) {
                     for (int i = 0; i < list1.size(); i++) {
-                        if (hlgPaymentDetailList.get(j).getId() == list1.get(i).getId()) {
+                        if (hlgPaymentDetailList.get(j).getId().equals(list1.get(i).getId())) {
                             bo = true;
                             map.put("id", list1.get(i).getId());
                             map.put("phone", phone);
@@ -967,7 +968,7 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
                 //循环找出重复项只报重复错误
                 if (list3.size() > 0) {
                     for (int i = 0; i < list3.size(); i++) {
-                        if (hlgPaymentDetailList.get(j).getId() == list3.get(i).getId()) {
+                        if (hlgPaymentDetailList.get(j).getId().equals(list3.get(i).getId())) {
                             bo = true;
                             map.put("id", list3.get(i).getId());
                             map.put("phone", phone);
@@ -1030,15 +1031,15 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
                         map.put("reason", "开户行或开户地未填写");
                         resultlist.add(map);
                         continue;
-                    }else{
-                        if(eacbnk.getBytes("UTF-8").length>62){
+                    } else {
+                        if (eacbnk.getBytes("UTF-8").length > 62) {
                             map.put("id", j + 3);
                             map.put("phone", phone);
                             map.put("reason", "开户行字符串长度过长");
                             resultlist.add(map);
                             continue;
                         }
-                        if(rcveaa.getBytes("UTF-8").length>120){
+                        if (rcveaa.getBytes("UTF-8").length > 120) {
                             map.put("id", j + 3);
                             map.put("phone", phone);
                             map.put("reason", "开户地字符串长度过长");