审核他人文件

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

@@ -17,7 +17,6 @@ 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.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.xssf.usermodel.XSSFCell;
@@ -1006,39 +1005,39 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         }
 
         List<OtherTaskFileInfoVO> list = taskMapper.getOtherTaskChargePage(queryBO,branchDepartment);
-        List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId())
-                .eq(User::getIsActive, 1)
-        );
+//        List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId())
+//                .eq(User::getIsActive, 1)
+//        );
 
-        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id",user.getCompanyId()));
-        CompanyDingding dingding = companyDingdingService.getOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
+//        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id",user.getCompanyId()));
+//        CompanyDingding dingding = companyDingdingService.getOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
 
-        if(CollectionUtils.isNotEmpty(list)){
-            Map<String, User> userMap = users.stream().collect(Collectors.toMap(User::getId, t -> t));
-            for (OtherTaskFileInfoVO otherTaskFileInfoVO : list) {
-                User createrUser = userMap.get(otherTaskFileInfoVO.getCreatorId());
-                User finalChargeUser = userMap.get(otherTaskFileInfoVO.getFinalChargeId());
-                String createrUserWxId = "";
-                String chargeUserWxId = "";
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    createrUserWxId = createrUser.getCorpwxRealUserid();
-                    chargeUserWxId = finalChargeUser.getCorpwxRealUserid();
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    createrUserWxId = createrUser.getDingdingUserid();
-                    chargeUserWxId = finalChargeUser.getDingdingUserid();
-                }
-                if(StringUtils.isNotBlank(createrUserWxId)){
-                    otherTaskFileInfoVO.setCreatorName("$userName=" + createrUserWxId + "$");
-                }else{
-                    otherTaskFileInfoVO.setCreatorName(createrUser.getName());
-                }
-                if(StringUtils.isNotBlank(chargeUserWxId)){
-                    otherTaskFileInfoVO.setFinalChargeName("$userName=" + chargeUserWxId + "$");
-                }else{
-                    otherTaskFileInfoVO.setFinalChargeName(finalChargeUser.getName());
-                }
-            }
-        }
+//        if(CollectionUtils.isNotEmpty(list)){
+//            Map<String, User> userMap = users.stream().collect(Collectors.toMap(User::getId, t -> t));
+//            for (OtherTaskFileInfoVO otherTaskFileInfoVO : list) {
+//                User createrUser = userMap.get(otherTaskFileInfoVO.getCreatorId());
+//                User finalChargeUser = userMap.get(otherTaskFileInfoVO.getFinalChargeId());
+//                String createrUserWxId = "";
+//                String chargeUserWxId = "";
+//                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+//                    createrUserWxId = createrUser.getCorpwxRealUserid();
+//                    chargeUserWxId = finalChargeUser.getCorpwxRealUserid();
+//                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    createrUserWxId = createrUser.getDingdingUserid();
+//                    chargeUserWxId = finalChargeUser.getDingdingUserid();
+//                }
+//                if(StringUtils.isNotBlank(createrUserWxId)){
+//                    otherTaskFileInfoVO.setCreatorName("$userName=" + createrUserWxId + "$");
+//                }else{
+//                    otherTaskFileInfoVO.setCreatorName(createrUser.getName());
+//                }
+//                if(StringUtils.isNotBlank(chargeUserWxId)){
+//                    otherTaskFileInfoVO.setFinalChargeName("$userName=" + chargeUserWxId + "$");
+//                }else{
+//                    otherTaskFileInfoVO.setFinalChargeName(finalChargeUser.getName());
+//                }
+//            }
+//        }
 
         int total = taskMapper.getOtherTaskChargePageTotal(queryBO,branchDepartment);
         Map<String, Object> map = new HashMap<>();