|
|
@@ -1259,9 +1259,11 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
|
|
|
Bills bills = billsMapper.selectById(id);
|
|
|
if (bills != null) {
|
|
|
bCorps = bCorpsService.getById(bills.getCorpId());
|
|
|
- R<Dept> deptR = sysClient.getDept(Long.parseLong(bills.getAccDept()));
|
|
|
- if (deptR.isSuccess()) {
|
|
|
- dept = deptR.getData();
|
|
|
+ if (ObjectUtils.isNotNull(bills.getAccDept())){
|
|
|
+ R<Dept> deptR = sysClient.getDept(Long.parseLong(bills.getAccDept()));
|
|
|
+ if (deptR.isSuccess()) {
|
|
|
+ dept = deptR.getData();
|
|
|
+ }
|
|
|
}
|
|
|
if ("SALES".equals(bills.getSrcType())) {
|
|
|
R<User> userR = userClient.userInfoById(bills.getSrcId());
|
|
|
@@ -1276,9 +1278,11 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
|
|
|
AeaBills bills = aeaBillsMapper.selectById(id);
|
|
|
if (bills != null) {
|
|
|
bCorps = bCorpsService.getById(bills.getCorpId());
|
|
|
- R<Dept> deptR = sysClient.getDept(Long.parseLong(bills.getAccDept()));
|
|
|
- if (deptR.isSuccess()) {
|
|
|
- dept = deptR.getData();
|
|
|
+ if (ObjectUtils.isNotNull(bills.getAccDept())){
|
|
|
+ R<Dept> deptR = sysClient.getDept(Long.parseLong(bills.getAccDept()));
|
|
|
+ if (deptR.isSuccess()) {
|
|
|
+ dept = deptR.getData();
|
|
|
+ }
|
|
|
}
|
|
|
if ("SALES".equals(bills.getSrcType())) {
|
|
|
R<User> userR = userClient.userInfoById(bills.getSrcId());
|
|
|
@@ -1294,9 +1298,11 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
|
|
|
CustomsDeclaration bills = customsDeclarationMapper.selectById(id);
|
|
|
if (bills != null) {
|
|
|
bCorps = bCorpsService.getById(bills.getCorpId());
|
|
|
- R<Dept> deptR = sysClient.getDept(Long.parseLong(bills.getAccDept()));
|
|
|
- if (deptR.isSuccess()) {
|
|
|
- dept = deptR.getData();
|
|
|
+ if (ObjectUtils.isNotNull(bills.getAccDept())){
|
|
|
+ R<Dept> deptR = sysClient.getDept(Long.parseLong(bills.getAccDept()));
|
|
|
+ if (deptR.isSuccess()) {
|
|
|
+ dept = deptR.getData();
|
|
|
+ }
|
|
|
}
|
|
|
if ("SALES".equals(bills.getSrcType())) {
|
|
|
R<User> userR = userClient.userInfoById(bills.getSrcId());
|
|
|
@@ -1312,9 +1318,11 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
|
|
|
Amends bills = amendsMapper.selectById(id);
|
|
|
if (bills != null) {
|
|
|
bCorps = bCorpsService.getById(bills.getCorpId());
|
|
|
- R<Dept> deptR = sysClient.getDept(Long.parseLong(bills.getAccDept()));
|
|
|
- if (deptR.isSuccess()) {
|
|
|
- dept = deptR.getData();
|
|
|
+ if (ObjectUtils.isNotNull(bills.getAccDept())){
|
|
|
+ R<Dept> deptR = sysClient.getDept(Long.parseLong(bills.getAccDept()));
|
|
|
+ if (deptR.isSuccess()) {
|
|
|
+ dept = deptR.getData();
|
|
|
+ }
|
|
|
}
|
|
|
if ("SEA".equals(bills.getBusinessType()) || "SIA".equals(bills.getBusinessType())) {
|
|
|
Bills bills1 = billsMapper.selectById(id);
|