|
@@ -9,11 +9,15 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
import com.fdkankan.fusion.common.ResultCode;
|
|
import com.fdkankan.fusion.common.ResultCode;
|
|
import com.fdkankan.fusion.common.enums.IdPreEnum;
|
|
import com.fdkankan.fusion.common.enums.IdPreEnum;
|
|
import com.fdkankan.fusion.entity.TmDepartment;
|
|
import com.fdkankan.fusion.entity.TmDepartment;
|
|
|
|
+import com.fdkankan.fusion.entity.TmRole;
|
|
import com.fdkankan.fusion.entity.TmUser;
|
|
import com.fdkankan.fusion.entity.TmUser;
|
|
|
|
+import com.fdkankan.fusion.entity.TmUserRole;
|
|
import com.fdkankan.fusion.exception.BusinessException;
|
|
import com.fdkankan.fusion.exception.BusinessException;
|
|
import com.fdkankan.fusion.mapper.ITmDepartmentMapper;
|
|
import com.fdkankan.fusion.mapper.ITmDepartmentMapper;
|
|
import com.fdkankan.fusion.service.ITmDepartmentService;
|
|
import com.fdkankan.fusion.service.ITmDepartmentService;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
+import com.fdkankan.fusion.service.ITmRoleService;
|
|
|
|
+import com.fdkankan.fusion.service.ITmUserRoleService;
|
|
import com.fdkankan.fusion.service.ITmUserService;
|
|
import com.fdkankan.fusion.service.ITmUserService;
|
|
import org.apache.catalina.User;
|
|
import org.apache.catalina.User;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -39,6 +43,10 @@ public class TmDepartmentServiceImpl extends ServiceImpl<ITmDepartmentMapper, Tm
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
ITmUserService tmUserService;
|
|
ITmUserService tmUserService;
|
|
|
|
+ @Autowired
|
|
|
|
+ ITmUserRoleService tmUserRoleService;
|
|
|
|
+ @Autowired
|
|
|
|
+ ITmRoleService tmRoleService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void insertDept(TmDepartment dept) {
|
|
public void insertDept(TmDepartment dept) {
|
|
@@ -98,6 +106,14 @@ public class TmDepartmentServiceImpl extends ServiceImpl<ITmDepartmentMapper, Tm
|
|
if(tmUser == null){
|
|
if(tmUser == null){
|
|
return new ArrayList<>();
|
|
return new ArrayList<>();
|
|
}
|
|
}
|
|
|
|
+ List<TmUserRole> tmUserRoles = tmUserRoleService.getByUserId(tmUser.getId());
|
|
|
|
+ if(tmUserRoles.size() >0){
|
|
|
|
+ TmUserRole tmUserRole = tmUserRoles.get(0);
|
|
|
|
+ TmRole tmRole = tmRoleService.getById(tmUserRole.getRoleId());
|
|
|
|
+ if(tmRole != null && tmRole.getRoleKey().equals("admin-ordinary")){
|
|
|
|
+ return Arrays.asList(this.getById(tmUser.getDeptId()));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return getDeptList(tmUser.getDeptId());
|
|
return getDeptList(tmUser.getDeptId());
|
|
}
|
|
}
|
|
|
|
|