|
@@ -639,6 +639,10 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
return ResponseJson.error("无权限操作!", null);
|
|
|
}
|
|
|
ReceiptVo receipt = receiptMapper.getReceiptDetail(id);
|
|
|
+ //超级管理员可以看,其他人不能看已确认的单
|
|
|
+ if (null != receipt.getConfirmUserPermissionId() && 4 != receiptUser.getUserType() && !receiptUser.getId().equals(receipt.getConfirmUserPermissionId())) {
|
|
|
+ return ResponseJson.error("无权限操作!", null);
|
|
|
+ }
|
|
|
if (null != receipt) {
|
|
|
setReceiptDetail(receipt);
|
|
|
List<OrderVo> orderList = new ArrayList<>();
|
|
@@ -2049,7 +2053,7 @@ public class ReceiptServiceImpl implements ReceiptService {
|
|
|
contentTime.add(group);
|
|
|
}
|
|
|
// 建设银行
|
|
|
- if (Arrays.asList(1, 18, 19,20).contains(typeId)) {
|
|
|
+ if (Arrays.asList(1, 18, 19, 20).contains(typeId)) {
|
|
|
for (int i = 1; i < 5; i++) {
|
|
|
if (contentTime.get(i).length() < 2) {
|
|
|
String s = contentTime.get(i);
|