Merge branch 'dev-lqc'

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkClientController.java

@@ -166,7 +166,8 @@ public class FosterwxCashWorkClientController {
 
                 fosterwxMobile = fosterwxMobileService.getOne(new LambdaQueryWrapper<FosterwxMobile>().eq(FosterwxMobile::getMobileNo, handle.getMobileNo()).eq(FosterwxMobile::getWorkWxCorpId, corp.getId()).last("LIMIT 1"));
 
-                return fosterwxMobile;
+                if (null != fosterwxMobile)
+                    return fosterwxMobile;
             }
 
             // 主体 昵称 组
@@ -175,7 +176,8 @@ public class FosterwxCashWorkClientController {
 
                 fosterwxMobile = fosterwxMobileService.getOne(new LambdaQueryWrapper<FosterwxMobile>().eq(FosterwxMobile::getCustserviceName, handle.getNickName()).eq(FosterwxMobile::getWorkWxCorpId, corp.getId()).last("LIMIT 1"));
 
-                return fosterwxMobile;
+                if (null != fosterwxMobile)
+                    return fosterwxMobile;
             }
         }
 
@@ -183,7 +185,8 @@ public class FosterwxCashWorkClientController {
         if (null != handle.getNickName() && !handle.getNickName().isEmpty() && null != handle.getTeamId() && !handle.getTeamId().isEmpty()) {
             fosterwxMobile = fosterwxMobileService.getOne(new LambdaQueryWrapper<FosterwxMobile>().eq(FosterwxMobile::getTeamId, handle.getTeamId()).eq(FosterwxMobile::getCustserviceName, handle.getNickName()).last("LIMIT 1"));
 
-            return fosterwxMobile;
+            if (null != fosterwxMobile)
+                return fosterwxMobile;
         }
 
         return null;