Browse Source

[fix]

工程管理 物料信息
修改物料审批流程节点赋值方法;
修改设置待办用户service方法,多选候选组添加物料模型;
修改客户基本信息controller,去除权限限制;
dev
王晓迪 3 months ago
parent
commit
a94949ee3e
  1. 2
      ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java
  2. 11
      ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java
  3. 3
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java

2
ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java

@ -185,7 +185,7 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService {
// 查询候选用户组,系统用户角色视图,group是角色
List<String> todoUserIdList = new ArrayList<>();
if("requisitioning".equals(module)||module.equals("expense")
||module.equals("customerQuote")||module.equals("salesorder")||module.equals("customer")){
||module.equals("customerQuote")||module.equals("salesorder")||module.equals("customer")||module.equals("material")){
todoUserIdList = bizTodoItemMapper.selectTodoUserListsByTaskId(task.getId());
}else{
todoUserIdList = bizTodoItemMapper.selectTodoUserListByTaskId(task.getId());

11
ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java

@ -745,14 +745,11 @@ public class ErpMaterialServiceImpl implements IErpMaterialService
private void buildAuthority(SysUser user, Map<String, Object> variables) {
Set<String> roleKeys = roleService.selectRoleKeys(user.getUserId());
// 角色不同审核人不同
if(roleKeys.contains("yfzjRole") || roleKeys.contains("admin")){
variables.put("authority",4);
}else if(roleKeys.contains("gczgRole")){
variables.put("authority",3);
}else if(roleKeys.contains("gcjlRole")){
variables.put("authority",2);
}else if(roleKeys.contains("gcwyRole")){
if(roleKeys.contains("gcwyRole")){
variables.put("authority",1);
}else if(roleKeys.contains("admin")||roleKeys.contains("gcjlRole")
||roleKeys.contains("yfzjRole")||roleKeys.contains("dqzgRole")){
variables.put("authority",2);
}
}

3
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java

@ -309,7 +309,7 @@ public class SysCustomerController extends BaseController
return AjaxResult.success("编辑成功,等待审核");
}
@RequiresPermissions("system:customer:audit")
@Log(title = "客户基本信息", businessType = BusinessType.UPDATE)
@PostMapping("/audit")
@ResponseBody
@ -419,7 +419,6 @@ public class SysCustomerController extends BaseController
return getDataTable(list);
}
@RequiresPermissions("system:customer:audit")
@PostMapping("/operList")
@ResponseBody
public TableDataInfo list(SysCustomerOper sysCustomerOper)

Loading…
Cancel
Save