mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mula:b3e5568216944a09cbce9a621195af7072a2a4a0
Branches Tags
mula:dev_1.0.1
mula:dev_1.0.2
mula:dev_1.0.0
mula:master
...
compare: mula:e1643a633149a15c9799282eb532aa164a1a81be
Branches Tags
mula:dev_1.0.1
mula:dev_1.0.2
mula:dev_1.0.0
mula:master

2 Commits
b3e5568216 ... e1643a6331

Author SHA1 Message Date
chenh e1643a6331 Merge branch 'dev_1.0.0' into dev_1.0.1 2026-01-15 17:00:37 +08:00
chenh 5f6f014226 feat(sip)：订单合同修改新增产品经理 2026-01-15 16:54:27 +08:00
1 changed files with 1 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java
View File

@ -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("marketing_promotion") ||ShiroUtils.getSysUser().isAdmin()) && updateFlag); 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("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));