|
@@ -1,5 +1,6 @@
|
|
package com.fs.company.controller.qw;
|
|
package com.fs.company.controller.qw;
|
|
|
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
import com.fs.common.annotation.Log;
|
|
import com.fs.common.annotation.Log;
|
|
import com.fs.common.core.controller.BaseController;
|
|
import com.fs.common.core.controller.BaseController;
|
|
import com.fs.common.core.domain.AjaxResult;
|
|
import com.fs.common.core.domain.AjaxResult;
|
|
@@ -30,6 +31,7 @@ import com.github.pagehelper.PageHelper;
|
|
import com.google.gson.Gson;
|
|
import com.google.gson.Gson;
|
|
import com.google.gson.reflect.TypeToken;
|
|
import com.google.gson.reflect.TypeToken;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
+import org.apache.commons.collections.CollectionUtils;
|
|
import org.codehaus.jettison.json.JSONException;
|
|
import org.codehaus.jettison.json.JSONException;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
@@ -39,6 +41,7 @@ import java.io.IOException;
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Objects;
|
|
import java.util.Objects;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.fs.his.utils.PhoneUtil.decryptAutoPhoneMk;
|
|
import static com.fs.his.utils.PhoneUtil.decryptAutoPhoneMk;
|
|
import static com.fs.his.utils.PhoneUtil.encryptPhone;
|
|
import static com.fs.his.utils.PhoneUtil.encryptPhone;
|
|
@@ -246,7 +249,17 @@ public class QwExternalContactController extends BaseController
|
|
@PutMapping("/transfer")
|
|
@PutMapping("/transfer")
|
|
public R transfer(@RequestBody TransferParam param)
|
|
public R transfer(@RequestBody TransferParam param)
|
|
{
|
|
{
|
|
-
|
|
|
|
|
|
+ if (ObjectUtil.isNotEmpty(param.getQwUserName())){
|
|
|
|
+ QwExternalContactParam qwExternalContact =new QwExternalContactParam();
|
|
|
|
+ qwExternalContact.setQwUserName(param.getQwUserName());
|
|
|
|
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
|
+ qwExternalContact.setCompanyId(loginUser.getCompany().getCompanyId());
|
|
|
|
+ List<QwExternalContactVO> list = qwExternalContactService.selectQwExternalContactListVO(qwExternalContact);
|
|
|
|
+ if (!CollectionUtils.isEmpty(list)){
|
|
|
|
+ List<Long> ids = list.stream().map(QwExternalContactVO::getId).collect(Collectors.toList());
|
|
|
|
+ param.setIds(ids);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return qwExternalContactService.transfer(param);
|
|
return qwExternalContactService.transfer(param);
|
|
}
|
|
}
|
|
/**
|
|
/**
|