Commit ec4f5c3f by shiwenbo

购砂单位系统和场站系统查询上传人时兼容区域公司系统,反之不支持。

parent fafe2545
......@@ -52,6 +52,7 @@ import com.beecode.bap.attachment.common.Utils;
import com.beecode.bap.attachment.exception.AttachmentDataDownLoadException;
import com.beecode.bap.attachment.exception.AttachmentDataUploadException;
import com.beecode.bap.attachment.exception.AttachmentException;
import com.beecode.bap.attachment.internal.CreatorAdapterService;
import com.beecode.bap.attachment.service.AttachmentService;
import com.beecode.inz.basis.pojo.SandUser;
import com.beecode.inz.basis.service.SandUserService;
......@@ -489,8 +490,8 @@ public class SandAttachmentController {
return false;
}
// @Autowired
// private CreatorAdapterService creatorAdapterService;
@Autowired
private CreatorAdapterService creatorAdapterService;
// private UUID getCurrentCreatorId() {
// return creatorAdapterService.getCurrentCreatorId();
......@@ -502,10 +503,13 @@ public class SandAttachmentController {
}
private String getCreatorName(UUID id) {
// return creatorAdapterService.getCreatorName(id);
String userName = creatorAdapterService.getCreatorName(id);
if(userName == null) {
SandUser user = sandUserService.getById(id);
return user.getTitle();
}
return userName;
}
private Map<String, Object> toMap(AttachmentInfo info) {
Map<String, Object> map = new HashMap<>(20);
......
......@@ -52,6 +52,7 @@ import com.beecode.bap.attachment.common.Utils;
import com.beecode.bap.attachment.exception.AttachmentDataDownLoadException;
import com.beecode.bap.attachment.exception.AttachmentDataUploadException;
import com.beecode.bap.attachment.exception.AttachmentException;
import com.beecode.bap.attachment.internal.CreatorAdapterService;
import com.beecode.bap.attachment.service.AttachmentService;
import com.beecode.inz.basis.pojo.WarehouseUser;
import com.beecode.inz.basis.service.WarehouseUserService;
......@@ -489,8 +490,8 @@ public class WarehouseAttachmentController {
return false;
}
// @Autowired
// private CreatorAdapterService creatorAdapterService;
@Autowired
private CreatorAdapterService creatorAdapterService;
// private UUID getCurrentCreatorId() {
// return creatorAdapterService.getCurrentCreatorId();
......@@ -502,10 +503,13 @@ public class WarehouseAttachmentController {
}
private String getCreatorName(UUID id) {
// return creatorAdapterService.getCreatorName(id);
String userName = creatorAdapterService.getCreatorName(id);
if(userName == null) {
WarehouseUser user = warehouseUserService.getById(id);
return user.getTitle();
}
return userName;
}
private Map<String, Object> toMap(AttachmentInfo info) {
Map<String, Object> map = new HashMap<>(20);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment