Commit 9bd9248e0086f47ca868b074066ef394444cef53
1 parent
2f027043
登录权限处理
Showing
3 changed files
with
24 additions
and
21 deletions
src/main/java/com/zteits/oa/api/dto/asraop/param/AsraOpQueryReq.java
| @@ -38,6 +38,14 @@ public class AsraOpQueryReq extends BaseRequest{ | @@ -38,6 +38,14 @@ public class AsraOpQueryReq extends BaseRequest{ | ||
| 38 | /**员工idlist*/ | 38 | /**员工idlist*/ |
| 39 | private List<Long> opParentIdLists; | 39 | private List<Long> opParentIdLists; |
| 40 | 40 | ||
| 41 | + public List<Long> getOpIdLists() { | ||
| 42 | + return opIdLists; | ||
| 43 | + } | ||
| 44 | + | ||
| 45 | + public void setOpIdLists(List<Long> opIdLists) { | ||
| 46 | + this.opIdLists = opIdLists; | ||
| 47 | + } | ||
| 48 | + | ||
| 41 | public List<Long> getOpParentIdLists() { | 49 | public List<Long> getOpParentIdLists() { |
| 42 | return opParentIdLists; | 50 | return opParentIdLists; |
| 43 | } | 51 | } |
src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
| @@ -4,6 +4,7 @@ import java.util.ArrayList; | @@ -4,6 +4,7 @@ import java.util.ArrayList; | ||
| 4 | import java.util.Date; | 4 | import java.util.Date; |
| 5 | import java.util.List; | 5 | import java.util.List; |
| 6 | 6 | ||
| 7 | +import com.xiaoleilu.hutool.util.CollectionUtil; | ||
| 7 | import org.springframework.beans.factory.annotation.Autowired; | 8 | import org.springframework.beans.factory.annotation.Autowired; |
| 8 | import org.springframework.stereotype.Component; | 9 | import org.springframework.stereotype.Component; |
| 9 | 10 |
src/main/java/com/zteits/oa/report/web/OAuthController.java
| 1 | package com.zteits.oa.report.web; | 1 | package com.zteits.oa.report.web; |
| 2 | 2 | ||
| 3 | -import static org.mockito.Matchers.contains; | ||
| 4 | - | ||
| 5 | -import java.util.ArrayList; | ||
| 6 | -import java.util.List; | ||
| 7 | - | ||
| 8 | -import javax.servlet.http.HttpServletRequest; | ||
| 9 | -import javax.servlet.http.HttpSession; | ||
| 10 | - | ||
| 11 | -import com.xiaoleilu.hutool.util.CollectionUtil; | ||
| 12 | -import com.zteits.oa.api.base.bean.PageBean; | ||
| 13 | -import org.slf4j.Logger; | ||
| 14 | -import org.slf4j.LoggerFactory; | ||
| 15 | -import org.springframework.beans.factory.annotation.Autowired; | ||
| 16 | -import org.springframework.util.StringUtils; | ||
| 17 | -import org.springframework.web.bind.annotation.PostMapping; | ||
| 18 | -import org.springframework.web.bind.annotation.RequestBody; | ||
| 19 | -import org.springframework.web.bind.annotation.RequestMapping; | ||
| 20 | -import org.springframework.web.bind.annotation.RestController; | ||
| 21 | - | ||
| 22 | import com.alibaba.fastjson.JSONObject; | 3 | import com.alibaba.fastjson.JSONObject; |
| 23 | import com.xiaoleilu.hutool.util.CollectionUtil; | 4 | import com.xiaoleilu.hutool.util.CollectionUtil; |
| 24 | import com.zteits.oa.api.base.bean.BizResult; | 5 | import com.zteits.oa.api.base.bean.BizResult; |
| 6 | +import com.zteits.oa.api.base.bean.PageBean; | ||
| 25 | import com.zteits.oa.api.base.constants.ErrorType; | 7 | import com.zteits.oa.api.base.constants.ErrorType; |
| 26 | import com.zteits.oa.api.base.constants.SessionEnum; | 8 | import com.zteits.oa.api.base.constants.SessionEnum; |
| 27 | import com.zteits.oa.api.dto.asraop.AsraOpDTO; | 9 | import com.zteits.oa.api.dto.asraop.AsraOpDTO; |
| @@ -31,9 +13,21 @@ import com.zteits.oa.api.dto.asraop.param.LoginOauthReq; | @@ -31,9 +13,21 @@ import com.zteits.oa.api.dto.asraop.param.LoginOauthReq; | ||
| 31 | import com.zteits.oa.api.service.report.query.AsraOpQueryService; | 13 | import com.zteits.oa.api.service.report.query.AsraOpQueryService; |
| 32 | import com.zteits.oa.report.vo.OAuthResult; | 14 | import com.zteits.oa.report.vo.OAuthResult; |
| 33 | import com.zteits.oa.util.MD5Utils; | 15 | import com.zteits.oa.util.MD5Utils; |
| 34 | - | ||
| 35 | import io.swagger.annotations.Api; | 16 | import io.swagger.annotations.Api; |
| 36 | import io.swagger.annotations.ApiOperation; | 17 | import io.swagger.annotations.ApiOperation; |
| 18 | +import org.slf4j.Logger; | ||
| 19 | +import org.slf4j.LoggerFactory; | ||
| 20 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 21 | +import org.springframework.util.StringUtils; | ||
| 22 | +import org.springframework.web.bind.annotation.PostMapping; | ||
| 23 | +import org.springframework.web.bind.annotation.RequestBody; | ||
| 24 | +import org.springframework.web.bind.annotation.RequestMapping; | ||
| 25 | +import org.springframework.web.bind.annotation.RestController; | ||
| 26 | + | ||
| 27 | +import javax.servlet.http.HttpServletRequest; | ||
| 28 | +import javax.servlet.http.HttpSession; | ||
| 29 | +import java.util.ArrayList; | ||
| 30 | +import java.util.List; | ||
| 37 | 31 | ||
| 38 | @Api("用户登录授权") | 32 | @Api("用户登录授权") |
| 39 | @RestController | 33 | @RestController |
| @@ -163,7 +157,7 @@ public class OAuthController { | @@ -163,7 +157,7 @@ public class OAuthController { | ||
| 163 | opList.add(dto.getId()); | 157 | opList.add(dto.getId()); |
| 164 | } | 158 | } |
| 165 | } | 159 | } |
| 166 | - queryOpTreeByOpId(queryOpList,opList); | 160 | + queryOpTreeByOpIds(queryOpList,opList); |
| 167 | } | 161 | } |
| 168 | } | 162 | } |
| 169 | return opList; | 163 | return opList; |