commit
This commit is contained in:
@@ -116,6 +116,7 @@ public class WelfareListController {
|
|||||||
wl.userState,
|
wl.userState,
|
||||||
wl.unionname,
|
wl.unionname,
|
||||||
wl.unitname,
|
wl.unitname,
|
||||||
|
wl.unitid,
|
||||||
wl.listId,
|
wl.listId,
|
||||||
wus.userSign,
|
wus.userSign,
|
||||||
wus.courierNumber,
|
wus.courierNumber,
|
||||||
@@ -171,7 +172,17 @@ public class WelfareListController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
sql.setCondition(cnd);
|
sql.setCondition(cnd);
|
||||||
return welfareListService.list(pageForm, sql);
|
Pagination list = welfareListService.list(pageForm, sql);
|
||||||
|
List<NutMap> listMap = list.getList();
|
||||||
|
if (!ShiroUtil.hasAnyRoles("sysadmin")) {
|
||||||
|
listMap.forEach(map -> {
|
||||||
|
if (map.getString("unitid").equals("DZJF000")) {
|
||||||
|
map.put("receiveAddress", StrUtil.isNotBlank(map.getString("receiveAddress")) ? "********" : "");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
list.setList(listMap);
|
||||||
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@@ -674,7 +685,6 @@ public class WelfareListController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@ViReturn
|
@ViReturn
|
||||||
@RequiresPermissions("welfare.list.mange")
|
@RequiresPermissions("welfare.list.mange")
|
||||||
@@ -819,7 +829,9 @@ 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")){
|
||||||
exportEntities.add(new ExcelExportEntity("收货地址", "receiveAddress", 20));
|
exportEntities.add(new ExcelExportEntity("收货地址", "receiveAddress", 20));
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
ViTool.excelResponse(response, "福利名单.xls");
|
ViTool.excelResponse(response, "福利名单.xls");
|
||||||
|
|||||||
Reference in New Issue
Block a user