还原转义相关

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/CompanyDingding.java

@@ -1,14 +1,15 @@
 package com.management.platform.entity;
 
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *
@@ -111,7 +112,8 @@ public class CompanyDingding extends Model<CompanyDingding> {
     /**
      * 通讯录是否需要转译
      */
-    @TableField("contact_need_translate")
+//    @TableField("contact_need_translate")
+    @TableField(exist = false)
     private Integer contactNeedTranslate;
 
 

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

@@ -902,39 +902,39 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
         }
 
         Page<ContactsVo> pageContacts = contactsMapper.pageContactsByPin(new Page( pageIndex, pageSize), map);
-        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId()));
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
+//        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId()));
+//        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
 //        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
-        Map<String, User> companyUserMap = new HashMap<>();
-        if(CollectionUtils.isNotEmpty(userList)){
-            companyUserMap  = userList.stream().collect(Collectors.toMap(User::getId, t -> t));
-        }
+//        Map<String, User> companyUserMap = new HashMap<>();
+//        if(CollectionUtils.isNotEmpty(userList)){
+//            companyUserMap  = userList.stream().collect(Collectors.toMap(User::getId, t -> t));
+//        }
 
         List<ContactsVo> records = pageContacts.getRecords();
         long total = pageContacts.getTotal();
 
-        for (ContactsVo record : records) {
-            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                User ownUser = companyUserMap.getOrDefault(record.getOwnerId(), null);
-                if(null != ownUser){
-                    record.setOwnerName("$username="+ownUser.getCorpwxUserid()+"$");
-                }
-                User createUser = companyUserMap.getOrDefault(record.getCreatorId(), null);
-                if(null != createUser){
-                    record.setCreatorName("$username="+createUser.getCorpwxUserid()+"$");
-                }
-            }
-//            else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//        for (ContactsVo record : records) {
+//            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
 //                User ownUser = companyUserMap.getOrDefault(record.getOwnerId(), null);
 //                if(null != ownUser){
-//                    record.setOwnerName("$username="+ownUser.getDingdingUserid()+"$");
+//                    record.setOwnerName("$username="+ownUser.getCorpwxUserid()+"$");
 //                }
 //                User createUser = companyUserMap.getOrDefault(record.getCreatorId(), null);
 //                if(null != createUser){
-//                    record.setCreatorName("$username="+createUser.getDingdingUserid()+"$");
+//                    record.setCreatorName("$username="+createUser.getCorpwxUserid()+"$");
 //                }
 //            }
-        }
+////            else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                User ownUser = companyUserMap.getOrDefault(record.getOwnerId(), null);
+////                if(null != ownUser){
+////                    record.setOwnerName("$username="+ownUser.getDingdingUserid()+"$");
+////                }
+////                User createUser = companyUserMap.getOrDefault(record.getCreatorId(), null);
+////                if(null != createUser){
+////                    record.setCreatorName("$username="+createUser.getDingdingUserid()+"$");
+////                }
+////            }
+//        }
 
         HashMap<String, Object> hashMap = new HashMap<>();
         hashMap.put("records", records);

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

@@ -16,7 +16,6 @@ import com.management.platform.service.SysDictService;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.EncryptedDocumentException;
@@ -1550,11 +1549,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
             List<SysRichFunction> functionContractList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部合同");
 //            CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
-            List<User> companyUserList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId()));
-            Map<String, User> companyUserMap = new HashMap<>();
-            if(CollectionUtils.isNotEmpty(companyUserList)){
-                companyUserMap  = companyUserList.stream().collect(Collectors.toMap(User::getId, t -> t));
-            }
+//            List<User> companyUserList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId()));
+//            Map<String, User> companyUserMap = new HashMap<>();
+//            if(CollectionUtils.isNotEmpty(companyUserList)){
+//                companyUserMap  = companyUserList.stream().collect(Collectors.toMap(User::getId, t -> t));
+//            }
 
             if(functionContractList.size() <= 0){
                 httpRespMsg.setError(MessageUtils.message("access.viewError"));
@@ -1617,18 +1616,19 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                 contractPageVO.setId(contract.getId());
                 contractPageVO.setCompanyId(contract.getCompanyId());
                 contractPageVO.setCreatorId(contract.getCreatorId());
-                User tmpUser = companyUserMap.getOrDefault(contract.getCreatorId(),null);
-                if(null != tmpUser){
-                    if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                        contractPageVO.setCreatorName("$username="+tmpUser.getCorpwxUserid()+"$");
-                    }
-//                    else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                        contractPageVO.setCreatorName("$username="+tmpUser.getDingdingUserid()+"$");
+//                User tmpUser = companyUserMap.getOrDefault(contract.getCreatorId(),null);
+//                if(null != tmpUser){
+//                    if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                        contractPageVO.setCreatorName("$username="+tmpUser.getCorpwxUserid()+"$");
 //                    }
-                    else{
-                        contractPageVO.setCreatorName(contract.getCreatorName());
-                    }
-                }
+////                    else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                        contractPageVO.setCreatorName("$username="+tmpUser.getDingdingUserid()+"$");
+////                    }
+//                    else{
+//                        contractPageVO.setCreatorName(contract.getCreatorName());
+//                    }
+//                }
+                contractPageVO.setCreatorName(contract.getCreatorName());
                 contractPageVO.setCreatorWxCorpId(contract.getCreatorWxCorpId());
                 contractPageVO.setStartDate(contract.getStartDate());
                 contractPageVO.setEndDate(contract.getEndDate());

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -95,7 +94,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         boolean hasPriviledgeAll = sysFunctionService.hasPriviledge(targetUsr.getRoleId(), "查看全部产品数据");
         boolean hasPriviledgeDept = sysFunctionService.hasPriviledge(targetUsr.getRoleId(), "查看负责部门产品数据");
 
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", targetUsr.getCompanyId()));
+//        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", targetUsr.getCompanyId()));
 //        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, targetUsr.getCompanyId()));
 
         //判断查看全部的权限
@@ -161,27 +160,29 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         records.forEach(r->{
             Optional<User> user = userList.stream().filter(u -> u.getId().equals(r.getInchargerId())).findFirst();
             if(user.isPresent()){
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    r.setCreatorName("$username="+user.get().getCorpwxUserid()+"$");
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                    r.setCreatorName("$username="+user.get().getDingdingUserid()+"$");
+                r.setInchargerName(user.get().getName());
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    r.setCreatorName("$username="+user.get().getCorpwxUserid()+"$");
+//                }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    r.setCreatorName("$username="+user.get().getDingdingUserid()+"$");
+////                }
+//                else{
+//                    r.setInchargerName(user.get().getName());
 //                }
-                else{
-                    r.setInchargerName(user.get().getName());
-                }
             }
             Optional<User> creator = userList.stream().filter(u -> u.getId().equals(r.getCreatorId())).findFirst();
             if(creator.isPresent()){
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    r.setCreatorName("$username="+creator.get().getCorpwxUserid()+"$");
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                    r.setCreatorName("$username="+creator.get().getDingdingUserid()+"$");
+                r.setCreatorName(creator.get().getName());
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    r.setCreatorName("$username="+creator.get().getCorpwxUserid()+"$");
+//                }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    r.setCreatorName("$username="+creator.get().getDingdingUserid()+"$");
+////                }
+//                else{
+//                    r.setCreatorName(creator.get().getName());
 //                }
-                else{
-                    r.setCreatorName(creator.get().getName());
-                }
             }
             Optional<SysDict> unit = sysDictOfProductUnit.stream().filter(u -> u.getId().equals(r.getUnit())).findFirst();
             if(unit.isPresent()){
@@ -663,7 +664,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         List<SysDict> sysDictOfProductUnit = sysDictMapper.selectList(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCompanyId, companyId).eq(SysDict::getCode, "ProductUnit"));
         boolean hasPriviledgeAll = sysFunctionService.hasPriviledge(targetUsr.getRoleId(), "查看全部产品数据");
         boolean hasPriviledgeDept = sysFunctionService.hasPriviledge(targetUsr.getRoleId(), "查看负责部门产品数据");
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", targetUsr.getCompanyId()));
+//        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", targetUsr.getCompanyId()));
 //        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, targetUsr.getCompanyId()));
 
         //判断查看全部的权限
@@ -729,27 +730,29 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         records.forEach(r->{
             Optional<User> user = userList.stream().filter(u -> u.getId().equals(r.getInchargerId())).findFirst();
             if(user.isPresent()){
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    r.setInchargerName("$username="+user.get().getCorpwxUserid()+"$");
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                    r.setInchargerName("$username="+user.get().getDingdingUserid()+"$");
+                r.setInchargerName(user.get().getName());
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    r.setInchargerName("$username="+user.get().getCorpwxUserid()+"$");
+//                }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    r.setInchargerName("$username="+user.get().getDingdingUserid()+"$");
+////                }
+//                else{
+//                    r.setInchargerName(user.get().getName());
 //                }
-                else{
-                    r.setInchargerName(user.get().getName());
-                }
             }
             Optional<User> creator = userList.stream().filter(u -> u.getId().equals(r.getCreatorId())).findFirst();
             if(creator.isPresent()){
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    r.setCreatorName("$username="+creator.get().getCorpwxUserid()+"$");
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                    r.setCreatorName("$username="+creator.get().getDingdingUserid()+"$");
+                r.setCreatorName(creator.get().getName());
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    r.setCreatorName("$username="+creator.get().getCorpwxUserid()+"$");
+//                }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    r.setCreatorName("$username="+creator.get().getDingdingUserid()+"$");
+////                }
+//                else{
+//                    r.setCreatorName(creator.get().getName());
 //                }
-                else{
-                    r.setCreatorName(creator.get().getName());
-                }
             }
             Optional<SysDict> unit = sysDictOfProductUnit.stream().filter(u -> u.getId().equals(r.getUnit())).findFirst();
             if(unit.isPresent()){

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -110,7 +109,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         List<Custom> customList = customService.list(new LambdaQueryWrapper<Custom>().eq(Custom::getCompanyId, user.getCompanyId()));
         List<BusinessOpportunity> businessOpportunityList = businessOpportunityService.list(new LambdaQueryWrapper<BusinessOpportunity>().eq(BusinessOpportunity::getCompanyId, user.getCompanyId()));
 
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
+//        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
 //        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
 
         orderLambdaQueryWrapper.eq(SalesOrder::getCompanyId,user.getCompanyId());
@@ -209,51 +208,55 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         records.forEach(r->{
             Optional<User> item = userList.stream().filter(u -> u.getId().equals(r.getCreatorId())).findFirst();
             if(item.isPresent()){
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    r.setCreatorName("$username="+item.get().getCorpwxUserid()+"$");
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                    r.setCreatorName("$username="+item.get().getDingdingUserid()+"$");
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    r.setCreatorName("$username="+item.get().getCorpwxUserid()+"$");
 //                }
-                else{
-                    r.setCreatorName(item.get().getName());
-                }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    r.setCreatorName("$username="+item.get().getDingdingUserid()+"$");
+////                }
+//                else{
+//                    r.setCreatorName(item.get().getName());
+//                }
+                r.setCreatorName(item.get().getName());
             }
             Optional<User> incharger = userList.stream().filter(u -> u.getId().equals(r.getInchargerId())).findFirst();
             if(incharger.isPresent()){
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    r.setInchargerName("$username="+incharger.get().getCorpwxUserid()+"$");
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                    r.setInchargerName("$username="+incharger.get().getDingdingUserid()+"$");
+                r.setInchargerName(incharger.get().getName());
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    r.setInchargerName("$username="+incharger.get().getCorpwxUserid()+"$");
+//                }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    r.setInchargerName("$username="+incharger.get().getDingdingUserid()+"$");
+////                }
+//                else{
+//                    r.setInchargerName(incharger.get().getName());
 //                }
-                else{
-                    r.setInchargerName(incharger.get().getName());
-                }
             }
             Optional<User> companySigner = userList.stream().filter(u -> u.getId().equals(r.getCompanySigner())).findFirst();
             if(companySigner.isPresent()){
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    r.setCompanySignerName("$username="+companySigner.get().getCorpwxUserid()+"$");
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                    r.setCompanySignerName("$username="+companySigner.get().getDingdingUserid()+"$");
+                r.setCompanySignerName(companySigner.get().getName());
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    r.setCompanySignerName("$username="+companySigner.get().getCorpwxUserid()+"$");
+//                }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    r.setCompanySignerName("$username="+companySigner.get().getDingdingUserid()+"$");
+////                }
+//                else{
+//                    r.setCompanySignerName(companySigner.get().getName());
 //                }
-                else{
-                    r.setCompanySignerName(companySigner.get().getName());
-                }
             }
             Optional<User> customSigner = userList.stream().filter(u -> u.getId().equals(r.getCustomSigner())).findFirst();
             if(customSigner.isPresent()){
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    r.setCustomSignerName("$username="+customSigner.get().getCorpwxUserid()+"$");
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                    r.setCustomSignerName("$username="+customSigner.get().getDingdingUserid()+"$");
+                r.setCustomSignerName(customSigner.get().getName());
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    r.setCustomSignerName("$username="+customSigner.get().getCorpwxUserid()+"$");
+//                }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    r.setCustomSignerName("$username="+customSigner.get().getDingdingUserid()+"$");
+////                }
+//                else{
+//                    r.setCustomSignerName(customSigner.get().getName());
 //                }
-                else{
-                    r.setCustomSignerName(customSigner.get().getName());
-                }
             }
             Optional<SysDict> type = sysDictOfOrderType.stream().filter(s -> s.getId().equals(r.getType())).findFirst();
             if(type.isPresent()){
@@ -338,7 +341,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         LambdaQueryWrapper<SalesOrder> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
         List<Custom> customList = customService.list(new LambdaQueryWrapper<Custom>().eq(Custom::getCompanyId, user.getCompanyId()));
         List<BusinessOpportunity> businessOpportunityList = businessOpportunityService.list(new LambdaQueryWrapper<BusinessOpportunity>().eq(BusinessOpportunity::getCompanyId, user.getCompanyId()));
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
+//        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
 //        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
 
         orderLambdaQueryWrapper.eq(SalesOrder::getCompanyId,user.getCompanyId());
@@ -443,53 +446,57 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         records.forEach(r->{
             Optional<User> item = userList.stream().filter(u -> u.getId().equals(r.getCreatorId())).findFirst();
             if(item.isPresent()){
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    r.setCreatorName("$username="+item.get().getCorpwxUserid()+"$");
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                    r.setCreatorName("$username="+item.get().getDingdingUserid()+"$");
+                r.setCreatorName(item.get().getName());
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    r.setCreatorName("$username="+item.get().getCorpwxUserid()+"$");
+//                }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    r.setCreatorName("$username="+item.get().getDingdingUserid()+"$");
+////                }
+//                else{
+//                    r.setCreatorName(item.get().getName());
 //                }
-                else{
-                    r.setCreatorName(item.get().getName());
-                }
 
             }
             Optional<User> incharger = userList.stream().filter(u -> u.getId().equals(r.getInchargerId())).findFirst();
             if(incharger.isPresent()){
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    r.setInchargerName("$username="+incharger.get().getCorpwxUserid()+"$");
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                    r.setInchargerName("$username="+incharger.get().getDingdingUserid()+"$");
+                r.setInchargerName(incharger.get().getName());
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    r.setInchargerName("$username="+incharger.get().getCorpwxUserid()+"$");
+//                }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    r.setInchargerName("$username="+incharger.get().getDingdingUserid()+"$");
+////                }
+//                else{
+//                    r.setInchargerName(incharger.get().getName());
 //                }
-                else{
-                    r.setInchargerName(incharger.get().getName());
-                }
 
             }
             Optional<User> companySigner = userList.stream().filter(u -> u.getId().equals(r.getCompanySigner())).findFirst();
             if(companySigner.isPresent()){
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    r.setCompanySignerName("$username="+companySigner.get().getCorpwxUserid()+"$");
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                    r.setCompanySignerName("$username="+companySigner.get().getDingdingUserid()+"$");
+                r.setCompanySignerName(companySigner.get().getName());
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    r.setCompanySignerName("$username="+companySigner.get().getCorpwxUserid()+"$");
+//                }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    r.setCompanySignerName("$username="+companySigner.get().getDingdingUserid()+"$");
+////                }
+//                else{
+//                    r.setCompanySignerName(companySigner.get().getName());
 //                }
-                else{
-                    r.setCompanySignerName(companySigner.get().getName());
-                }
             }
             Optional<User> customSigner = userList.stream().filter(u -> u.getId().equals(r.getCustomSigner())).findFirst();
             if(customSigner.isPresent()){
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    r.setCustomSignerName("$username="+customSigner.get().getCorpwxUserid()+"$");
-                }
-//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-//                    r.setCustomSignerName("$username="+customSigner.get().getDingdingUserid()+"$");
+                r.setCustomSignerName(customSigner.get().getName());
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    r.setCustomSignerName("$username="+customSigner.get().getCorpwxUserid()+"$");
+//                }
+////                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+////                    r.setCustomSignerName("$username="+customSigner.get().getDingdingUserid()+"$");
+////                }
+//                else{
+//                    r.setCustomSignerName(customSigner.get().getName());
 //                }
-                else{
-                    r.setCustomSignerName(customSigner.get().getName());
-                }
             }
             Optional<SysDict> type = sysDictOfOrderType.stream().filter(s -> s.getId().equals(r.getType())).findFirst();
             if(type.isPresent()){

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

@@ -1253,12 +1253,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 
         List<TasKVo> taskVoList =taskMapper.getPageListTaskByPin(taskDto);
         for (TasKVo tasKVo : taskVoList) {
-            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                User tmpUser = companyUserMap.getOrDefault(tasKVo.getCreaterId(), null);
-                if(null != tmpUser){
-                    tasKVo.setCreaterName("$username="+tmpUser.getCorpwxUserid()+"$");
-                }
-            }
+//            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                User tmpUser = companyUserMap.getOrDefault(tasKVo.getCreaterId(), null);
+//                if(null != tmpUser){
+//                    tasKVo.setCreaterName("$username="+tmpUser.getCorpwxUserid()+"$");
+//                }
+//            }
 //            else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
 //                User tmpUser = companyUserMap.getOrDefault(tasKVo.getCreaterId(), null);
 //                if(null != tmpUser){
@@ -1323,27 +1323,27 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         TasKVo tasKVo = new TasKVo();
         Task task = taskMapper.selectById(id);
         User user = userMapper.selectById(request.getHeader("Token"));
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
-        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
+//        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
+//        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
 
         if (task!=null){
             BeanUtils.copyProperties(task,tasKVo);
             List<String> queryIds = new ArrayList<>();
             queryIds.add(task.getOwnerId());
             queryIds.add(task.getCreaterId());
-            Map<String, User> companyUserMap = new HashMap<>();
-            if(CollectionUtils.isNotEmpty(queryIds)){
-                List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getId, queryIds));
-                if(CollectionUtils.isNotEmpty(users)){
-                    companyUserMap  = users.stream().collect(Collectors.toMap(User::getId, t -> t));
-                }
-            }
-            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                User createUser = companyUserMap.getOrDefault(task.getCreaterId(), null);
-                if(null != createUser){
-                    task.setCreaterName("$username="+createUser.getCorpwxUserid()+"$");
-                }
-            }
+//            Map<String, User> companyUserMap = new HashMap<>();
+//            if(CollectionUtils.isNotEmpty(queryIds)){
+//                List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getId, queryIds));
+//                if(CollectionUtils.isNotEmpty(users)){
+//                    companyUserMap  = users.stream().collect(Collectors.toMap(User::getId, t -> t));
+//                }
+//            }
+//            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                User createUser = companyUserMap.getOrDefault(task.getCreaterId(), null);
+//                if(null != createUser){
+//                    task.setCreaterName("$username="+createUser.getCorpwxUserid()+"$");
+//                }
+//            }
 //            else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
 //                User createUser = companyUserMap.getOrDefault(task.getCreaterId(), null);
 //                if(null != createUser){