转义回退修改

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -1971,10 +1971,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         Integer WXCompanyId = user.getCompanyId();
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", WXCompanyId));
 
-        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
-
-        List<User> companyUsers = userMapper.selectList(new QueryWrapper<User>().eq("company_id",user.getCompanyId()));
-        Map<String, User> companyUserMap = companyUsers.stream().collect(Collectors.toMap(User::getId, t -> t));
+//        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
+//        List<User> companyUsers = userMapper.selectList(new QueryWrapper<User>().eq("company_id",user.getCompanyId()));
+//        Map<String, User> companyUserMap = companyUsers.stream().collect(Collectors.toMap(User::getId, t -> t));
         //当企业开启了微信通讯录的情况下
         if (org.apache.commons.lang3.StringUtils.isNotBlank(keyword) && wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact()==1){
             HashMap<String, List> result = wxCorpInfoService.getOpenId(wxCorpInfo.getCorpid(), keyword, cursor,1,200);
@@ -1986,20 +1985,20 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             if (users.size()!=0){
 //                List<User> realUser = userMapper.selectList(new QueryWrapper<User>().in("corpwx_userid", users));
                 List<Map<String,Object>> realUser = userMapper.selectListSimple(users);
-                for (Map<String, Object> map : realUser) {
-                    if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                        User tmpUser = companyUserMap.getOrDefault(map.get("value"),null);
-                        if(null != tmpUser){
-                            map.put("label","$username="+tmpUser.getCorpwxUserid()+"$");
-                        }
-                    }
-//                    else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                for (Map<String, Object> map : realUser) {
+//                    if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
 //                        User tmpUser = companyUserMap.getOrDefault(map.get("value"),null);
 //                        if(null != tmpUser){
-//                            map.put("label","$username="+tmpUser.getDingdingUserid()+"$");
+//                            map.put("label","$username="+tmpUser.getCorpwxUserid()+"$");
 //                        }
 //                    }
-                }
+////                    else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                        User tmpUser = companyUserMap.getOrDefault(map.get("value"),null);
+////                        if(null != tmpUser){
+////                            map.put("label","$username="+tmpUser.getDingdingUserid()+"$");
+////                        }
+////                    }
+//                }
                 msg.data = realUser;
                 return msg;
             }else {
@@ -2025,20 +2024,20 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
 //            List<User> userList = userMapper.selectList(wrapper);
             List<Map<String, Object>> userList=userMapper.getSimpleActiveUserList(hashMap);
-            for (Map<String, Object> map : userList) {
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    User tmpUser = companyUserMap.getOrDefault(map.get("value"),null);
-                    if(null != tmpUser){
-                        map.put("label","$username="+tmpUser.getCorpwxUserid()+"$");
-                    }
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//            for (Map<String, Object> map : userList) {
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
 //                    User tmpUser = companyUserMap.getOrDefault(map.get("value"),null);
 //                    if(null != tmpUser){
-//                        map.put("label","$username="+tmpUser.getDingdingUserid()+"$");
+//                        map.put("label","$username="+tmpUser.getCorpwxUserid()+"$");
 //                    }
 //                }
-            }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    User tmpUser = companyUserMap.getOrDefault(map.get("value"),null);
+////                    if(null != tmpUser){
+////                        map.put("label","$username="+tmpUser.getDingdingUserid()+"$");
+////                    }
+////                }
+//            }
             msg.data = userList;
             return msg;
         }