|
@@ -18,7 +18,9 @@ import com.platform.dao.mapper.sb.SbPositionMapper;
|
|
|
import com.platform.dao.mapper.upms.SysDeptMapper;
|
|
|
import com.platform.dao.mapper.upms.SysUserDeptMapper;
|
|
|
import com.platform.dao.mapper.upms.SysUserMapper;
|
|
|
+import com.platform.dao.mapper.upms.SysUserRoleMapper;
|
|
|
import com.platform.dao.util.MessageTemplateUtil;
|
|
|
+import com.platform.dao.vo.SysUserRoleVO;
|
|
|
import com.platform.dao.vo.SysUserVO;
|
|
|
import com.platform.dao.vo.query.preparation.PreparationVO;
|
|
|
import com.platform.service.base.impl.BaseServiceImpl;
|
|
@@ -57,6 +59,8 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
private SysFileService sysFileService;
|
|
|
@Resource
|
|
|
private SysDeptMapper sysDeptMapper;
|
|
|
+ @Resource
|
|
|
+ private SysUserRoleMapper sysUserRoleMapper;
|
|
|
|
|
|
@Override
|
|
|
public int batchDelete(List<String> ids) {
|
|
@@ -122,7 +126,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
|
|
|
@Override
|
|
|
public void dispatchPreparation(PreparationDTO model) {
|
|
|
- String roles = com.platform.common.util.StringUtils.getRoles();
|
|
|
+ String roles = getRoles();
|
|
|
if(!roles.contains(SysRoleCodeEnum.PREPARATION_MANAGER.name())){
|
|
|
throw new DeniedException("不具备派单权限");
|
|
|
}
|
|
@@ -147,6 +151,21 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
sendMessageToRepairer(userVOS,model);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 获取当前用户的角色集合
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ private String getRoles(){
|
|
|
+ // 根据用户的角色来定
|
|
|
+ StringBuilder roleCodes = new StringBuilder();
|
|
|
+
|
|
|
+ List<SysUserRoleVO> roles = sysUserRoleMapper.selectRoleListByUserId(SecurityUtils.getUserInfo().getUserId());
|
|
|
+ roles.forEach(item->{
|
|
|
+ roleCodes.append(item.getRoleCode()).append("&");
|
|
|
+ });
|
|
|
+ return roleCodes.toString();
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public void completePreparation(PreparationDTO model) {
|
|
|
Preparation preparation = mapper.selectByPrimaryKey(model.getId());
|