commit
This commit is contained in:
@@ -829,7 +829,7 @@ public class WelfareListController {
|
|||||||
exportEntities.add(new ExcelExportEntity("单位", "unitname", 20));
|
exportEntities.add(new ExcelExportEntity("单位", "unitname", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("科室", "threeUnitName", 20));
|
exportEntities.add(new ExcelExportEntity("科室", "threeUnitName", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("所选福利", "gist_list", 20));
|
exportEntities.add(new ExcelExportEntity("所选福利", "gist_list", 20));
|
||||||
if (!ShiroUtil.hasAnyRoles("sysadmin")){
|
if (ShiroUtil.hasAnyRoles("sysadmin")){
|
||||||
exportEntities.add(new ExcelExportEntity("收货地址", "receiveAddress", 20));
|
exportEntities.add(new ExcelExportEntity("收货地址", "receiveAddress", 20));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-1
@@ -877,7 +877,9 @@ public class WelfareSingleController {
|
|||||||
// exportEntities.add(new ExcelExportEntity("收货地址", "receiveAddress", 100));
|
// exportEntities.add(new ExcelExportEntity("收货地址", "receiveAddress", 100));
|
||||||
exportEntities.add(new ExcelExportEntity("收货人", "recipient", 15));
|
exportEntities.add(new ExcelExportEntity("收货人", "recipient", 15));
|
||||||
exportEntities.add(new ExcelExportEntity("联系方式", "phone", 20));
|
exportEntities.add(new ExcelExportEntity("联系方式", "phone", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("收货地址", "address", 60));
|
if (ShiroUtil.hasAnyRoles("sysadmin")){
|
||||||
|
exportEntities.add(new ExcelExportEntity("收货地址", "address", 60));
|
||||||
|
}
|
||||||
ExcelExportEntity excelExportEntity = new ExcelExportEntity();
|
ExcelExportEntity excelExportEntity = new ExcelExportEntity();
|
||||||
excelExportEntity.setName("签字");
|
excelExportEntity.setName("签字");
|
||||||
excelExportEntity.setKey("qzBytes");
|
excelExportEntity.setKey("qzBytes");
|
||||||
|
|||||||
@@ -1263,7 +1263,9 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
|
|||||||
}
|
}
|
||||||
v.setRecipient(addressMap.get("收件人"));
|
v.setRecipient(addressMap.get("收件人"));
|
||||||
v.setPhone(addressMap.get("联系方式"));
|
v.setPhone(addressMap.get("联系方式"));
|
||||||
v.setAddress(addressMap.get("收货地址"));
|
if (ShiroUtil.hasAnyRoles("sysadmin")){
|
||||||
|
v.setAddress(addressMap.get("收货地址"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user