Merge branch 'LeoN'

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

@@ -156,8 +156,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             return AjaxResult.error("该站点中该手机编码已存在！请确认！");
         }
         //.验证企微主体ID&客服昵称是否重复
-        if ((addHandle.getRaw().getWorkWxCorpId() != null || !addHandle.getRaw().getWorkWxCorpId().equals(0))
-                && (addHandle.getRaw().getCustserviceName() != null || !addHandle.getRaw().getCustserviceName().isEmpty())){
+        if (addHandle.getRaw().getWorkWxCorpId() != null && (addHandle.getRaw().getCustserviceName() != null || !addHandle.getRaw().getCustserviceName().isEmpty())){
             Integer hasCorpIdAndCustServiceNm = fosterwxMobileService.count(
                     new QueryWrapper<FosterwxMobile>()
                             .eq("work_wx_corp_id",addHandle.getRaw().getWorkWxCorpId())
@@ -168,7 +167,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             }
         }
         //.验证teamID是否为空
-        if (addHandle.getRaw().getTeamId() != null || !addHandle.getRaw().getTeamId().isEmpty()){
+        if (addHandle.getRaw().getTeamId() != null && !addHandle.getRaw().getTeamId().isEmpty()){
             Integer hasTeamId = fosterwxMobileService.count(
                     new QueryWrapper<FosterwxMobile>()
                             .eq("team_id",addHandle.getRaw().getTeamId())
@@ -216,7 +215,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             // 单独更新账号操作
             //.验证企微主体ID&客服昵称是否重复
             if (!editHandle.getRaw().getWorkWxCorpId().equals(0) &&
-                    (editHandle.getRaw().getCustserviceName() != null || !editHandle.getRaw().getCustserviceName().isEmpty())){
+                    (editHandle.getRaw().getCustserviceName() != null && !editHandle.getRaw().getCustserviceName().isEmpty())){
                 Integer hasCorpIdAndCustServiceNm = fosterwxMobileService.count(
                         new QueryWrapper<FosterwxMobile>()
                                 .ne("id",id)
@@ -228,7 +227,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
                 }
             }
             //.验证teamID是否为空
-            if (editHandle.getRaw().getTeamId() != null || !editHandle.getRaw().getTeamId().isEmpty()){
+            if (editHandle.getRaw().getTeamId() != null && !editHandle.getRaw().getTeamId().isEmpty()){
                 Integer hasTeamId = fosterwxMobileService.count(
                         new QueryWrapper<FosterwxMobile>()
                                 .ne("id",id)

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxMobileWxfriendServiceImpl.java

@@ -88,26 +88,26 @@ public class FosterwxMobileWxfriendServiceImpl extends ServiceImpl<FosterwxMobil
         List<FosterwxMobileWxfriend> friends = this.list(new QueryWrapper<FosterwxMobileWxfriend>()
                 .in("mobile_id",mobileIds)
         );
-        Map<Integer,Boolean> friendsNames = new HashMap<>();
+        Map<String,Boolean> friendsNames = new HashMap<>();
         for (FosterwxMobileWxfriend add :addFosterwxMobileHandle.getFriends()){
-            if(friendsNames.get(add.getFriendId()) != null){
-                res.setErr(HttpMsg.wxFriendResume+add.getFriendId().toString());
+            if(friendsNames.get(add.getWxName()) != null){
+                res.setErr(HttpMsg.wxFriendResume+add.getWxName());
                 return res;
             }
-            friendsNames.put(add.getFriendId(),true);
-            Boolean findRes = this.checkWxFriendCnt(friends,add.getFriendId());
+            friendsNames.put(add.getWxName(),true);
+            Boolean findRes = this.checkWxFriendCnt(friends,add.getWxName());
             if (!findRes){
-                res.setErr(HttpMsg.wxFriendCntMax3+add.getFriendId());
+                res.setErr(HttpMsg.wxFriendCntMax3+add.getWxName());
                 return res;
             }
         }
         return res;
     }
 
-    public Boolean checkWxFriendCnt(List<FosterwxMobileWxfriend> row,Integer friendId){
+    public Boolean checkWxFriendCnt(List<FosterwxMobileWxfriend> row,String wxName){
         Integer findCnt = 0;
         for (FosterwxMobileWxfriend fosterwxMobileWxfriend : row){
-            if (fosterwxMobileWxfriend.getFriendId().equals(friendId)){
+            if (fosterwxMobileWxfriend.getWxName().equals(wxName)){
                 findCnt++;
             }
             if (findCnt >= 3){