|
@@ -481,9 +481,25 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public AbstractPageResultBean<PreparationVO> selectWechatPageList(PreparationDTO record, int pageNum, int pageSize) {
|
|
public AbstractPageResultBean<PreparationVO> selectWechatPageList(PreparationDTO record, int pageNum, int pageSize) {
|
|
- PageHelper.startPage(pageNum, pageSize);
|
|
|
|
UserInfo userInfo = SecurityUtils.getUserInfo();
|
|
UserInfo userInfo = SecurityUtils.getUserInfo();
|
|
- record.setTempUserId(userInfo.getUserId());
|
|
|
|
|
|
+ // 获取用户角色
|
|
|
|
+ String roles = getRoleCodes();
|
|
|
|
+ if(userInfo.getSuperAdmin() != 1){
|
|
|
|
+ record.setDelUserId(userInfo.getUserId());
|
|
|
|
+ if(roles.contains(SysRoleCodeEnum.DEPT_LEADER.name())){
|
|
|
|
+ // 部门负责人(执行和申请)
|
|
|
|
+ record.setTempUserId(userInfo.getUserId());
|
|
|
|
+ }else if(roles.contains(SysRoleCodeEnum.DEPT_MANAGER.name())){
|
|
|
|
+ // 申请部门主管
|
|
|
|
+ record.setApplyVerifyUserId(userInfo.getUserId());
|
|
|
|
+ }else if(roles.contains(SysRoleCodeEnum.PREPARATION_USER.name())){
|
|
|
|
+ // 执行人
|
|
|
|
+ record.setRepairUserId(userInfo.getUserId());
|
|
|
|
+ }else {
|
|
|
|
+ // 申请人
|
|
|
|
+ record.setUserId(userInfo.getUserId());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
if(record.getStatus() != null && record.getStatus() == 99){
|
|
if(record.getStatus() != null && record.getStatus() == 99){
|
|
List<Integer> statusList = ListUtils.newArrayList();
|
|
List<Integer> statusList = ListUtils.newArrayList();
|
|
statusList.add(PreparationStatusEnum.NOT_ALLOCATED.getValue());
|
|
statusList.add(PreparationStatusEnum.NOT_ALLOCATED.getValue());
|
|
@@ -494,6 +510,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
record.setStatusList(statusList);
|
|
record.setStatusList(statusList);
|
|
record.setStatus(null);
|
|
record.setStatus(null);
|
|
}
|
|
}
|
|
|
|
+ PageHelper.startPage(pageNum, pageSize);
|
|
return new MyPage(mapper.selectList(record));
|
|
return new MyPage(mapper.selectList(record));
|
|
}
|
|
}
|
|
|
|
|