Compare commits
No commits in common. "e1643a633149a15c9799282eb532aa164a1a81be" and "b3e5568216944a09cbce9a621195af7072a2a4a0" have entirely different histories.
e1643a6331
...
b3e5568216
|
|
@ -105,7 +105,7 @@ public class VueProjectOrderInfoController extends BaseController {
|
||||||
("产品经理".equals(todoCompletedList.get(0).getTaskName()) || "售前".equals(todoCompletedList.get(0).getTaskName()))
|
("产品经理".equals(todoCompletedList.get(0).getTaskName()) || "售前".equals(todoCompletedList.get(0).getTaskName()))
|
||||||
: (boolean) mmap.get("canUpdate");
|
: (boolean) mmap.get("canUpdate");
|
||||||
//是否可修改文件
|
//是否可修改文件
|
||||||
mmap.put("updateFile", (ShiroUtils.getSubject().hasRole("sale_assistant")||ShiroUtils.getSubject().hasRole("business")||ShiroUtils.getSubject().hasRole("product_manager")||ShiroUtils.getSubject().hasRole("marketing_promotion") ||ShiroUtils.getSysUser().isAdmin()) && updateFlag);
|
mmap.put("updateFile", (ShiroUtils.getSubject().hasRole("sale_assistant")||ShiroUtils.getSubject().hasRole("business")||ShiroUtils.getSubject().hasRole("marketing_promotion") ||ShiroUtils.getSysUser().isAdmin()) && updateFlag);
|
||||||
mmap.put("uploadFinalFile", (ShiroUtils.getSubject().hasRole("business") || ShiroUtils.getSysUser().isAdmin()) &&
|
mmap.put("uploadFinalFile", (ShiroUtils.getSubject().hasRole("business") || ShiroUtils.getSysUser().isAdmin()) &&
|
||||||
ProjectOrderInfo.OrderStatus.APPROVE_COMPLETE.getCode().equals(projectOrderInfo.getOrderStatus()));
|
ProjectOrderInfo.OrderStatus.APPROVE_COMPLETE.getCode().equals(projectOrderInfo.getOrderStatus()));
|
||||||
mmap.put("todo", todoService.selectTodo(todo));
|
mmap.put("todo", todoService.selectTodo(todo));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue