|
@@ -5,8 +5,10 @@ import com.dgtly.common.config.ServerConfig;
|
|
|
import com.dgtly.common.core.controller.ApiBaseController;
|
|
|
import com.dgtly.common.core.domain.AjaxResult;
|
|
|
import com.dgtly.common.core.domain.ParameterObject;
|
|
|
+import com.dgtly.system.domain.AssRelcustomerinfo;
|
|
|
import com.dgtly.system.domain.CustomersExt;
|
|
|
import com.dgtly.system.domain.SysUser;
|
|
|
+import com.dgtly.system.domain.SysUserExt;
|
|
|
import com.dgtly.system.service.IAssRelcustomerinfoService;
|
|
|
import com.dgtly.system.service.ICustomersExtService;
|
|
|
import com.dgtly.system.service.ISysUserExtService;
|
|
@@ -20,6 +22,7 @@ import io.swagger.annotations.ApiImplicitParam;
|
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.tomcat.util.digester.ArrayStack;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
@@ -28,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import java.io.File;
|
|
|
import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
/**
|
|
@@ -515,15 +519,57 @@ public class EsignController extends ApiBaseController {
|
|
|
String userId = obj.getString("userId");
|
|
|
Map map = new HashMap(5);
|
|
|
SysUser sysUser = userService.selectUserById(Long.parseLong(userId));
|
|
|
+// /*根据org_code查询多个经销商列表*/
|
|
|
+ List<SysUserExt> sysUserExtList = new ArrayStack<>();
|
|
|
+ List<AssRelcustomerinfo> assRelcustomerinfoList= assRelcustomerinfoService.selectRelcustomerinfoListByorgCode(sysUser.getSysUserExt().getOrgCode());
|
|
|
+ if (assRelcustomerinfoList.size()>0){
|
|
|
+ for (AssRelcustomerinfo ar:assRelcustomerinfoList) {
|
|
|
+ SysUserExt sysUserExt = new SysUserExt();
|
|
|
+ sysUserExt.setUserId(sysUser.getSysUserExt().getUserId());
|
|
|
+ sysUserExt.setOrgCode(ar.getKunnr());
|
|
|
+ sysUserExt.setOrgName(ar.getName1());
|
|
|
+ sysUserExt.setSalesLevel(sysUser.getSysUserExt().getSalesLevel());
|
|
|
+ sysUserExt.setBossEmployeeId(sysUser.getSysUserExt().getBossEmployeeId());
|
|
|
+ sysUserExt.setBossName(sysUser.getSysUserExt().getBossName());
|
|
|
+ sysUserExt.setSapEmployeeId(sysUser.getSysUserExt().getSapEmployeeId());
|
|
|
+ sysUserExt.setCustomerCode(sysUser.getSysUserExt().getCustomerCode());
|
|
|
+ sysUserExt.setIsCustomerManager(sysUser.getSysUserExt().getIsCustomerManager());
|
|
|
+ sysUserExt.setPostCode(sysUser.getSysUserExt().getPostCode());
|
|
|
+ sysUserExt.setPostName(sysUser.getSysUserExt().getPostName());
|
|
|
+ sysUserExtList.add(sysUserExt);
|
|
|
+ }
|
|
|
+ SysUserExt sysUserExt = new SysUserExt();
|
|
|
+ sysUserExt.setUserId(sysUser.getSysUserExt().getUserId());
|
|
|
+ sysUserExt.setOrgCode(assRelcustomerinfoList.get(0).getMainkunnr());
|
|
|
+ sysUserExt.setOrgName(assRelcustomerinfoList.get(0).getMainname1());
|
|
|
+ sysUserExt.setSalesLevel(sysUser.getSysUserExt().getSalesLevel());
|
|
|
+ sysUserExt.setBossEmployeeId(sysUser.getSysUserExt().getBossEmployeeId());
|
|
|
+ sysUserExt.setBossName(sysUser.getSysUserExt().getBossName());
|
|
|
+ sysUserExt.setSapEmployeeId(sysUser.getSysUserExt().getSapEmployeeId());
|
|
|
+ sysUserExt.setCustomerCode(sysUser.getSysUserExt().getCustomerCode());
|
|
|
+ sysUserExt.setIsCustomerManager(sysUser.getSysUserExt().getIsCustomerManager());
|
|
|
+ sysUserExt.setPostCode(sysUser.getSysUserExt().getPostCode());
|
|
|
+ sysUserExt.setPostName(sysUser.getSysUserExt().getPostName());
|
|
|
+ sysUserExtList.add(sysUserExt);
|
|
|
+ }
|
|
|
+ sysUser.setSysUserExtLsit(sysUserExtList);
|
|
|
if (sysUser!=null){
|
|
|
map.put("user",sysUser);
|
|
|
- CustomersExt customersExt = customersExtService.selectCustomersExtById(sysUser.getSysUserExt().getOrgCode());
|
|
|
- if (customersExt!=null){
|
|
|
- map.put("customers",customersExt);
|
|
|
+ List<CustomersExt> customersExtList = new ArrayStack<>();
|
|
|
+ for (SysUserExt sysUserExt:sysUserExtList) {
|
|
|
+ CustomersExt customersExt = customersExtService.selectCustomersExtById(sysUserExt.getOrgCode());
|
|
|
+ if (customersExt!=null){
|
|
|
+ customersExtList.add(customersExt);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ map.put("customersExtList",customersExtList);
|
|
|
+ return AjaxResult.success(map);
|
|
|
+ /*if (customersExtList.size()>0){
|
|
|
+ map.put("customersExtList",customersExtList);
|
|
|
return AjaxResult.success(map);
|
|
|
}else{
|
|
|
return AjaxResult.success(map);
|
|
|
- }
|
|
|
+ }*/
|
|
|
}else{
|
|
|
return AjaxResult.error("用户不存在");
|
|
|
}
|