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 | 38 | /**员工idlist*/ |
39 | 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 | 49 | public List<Long> getOpParentIdLists() { |
42 | 50 | return opParentIdLists; |
43 | 51 | } | ... | ... |
src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
src/main/java/com/zteits/oa/report/web/OAuthController.java
1 | 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 | 3 | import com.alibaba.fastjson.JSONObject; |
23 | 4 | import com.xiaoleilu.hutool.util.CollectionUtil; |
24 | 5 | import com.zteits.oa.api.base.bean.BizResult; |
6 | +import com.zteits.oa.api.base.bean.PageBean; | |
25 | 7 | import com.zteits.oa.api.base.constants.ErrorType; |
26 | 8 | import com.zteits.oa.api.base.constants.SessionEnum; |
27 | 9 | import com.zteits.oa.api.dto.asraop.AsraOpDTO; |
... | ... | @@ -31,9 +13,21 @@ import com.zteits.oa.api.dto.asraop.param.LoginOauthReq; |
31 | 13 | import com.zteits.oa.api.service.report.query.AsraOpQueryService; |
32 | 14 | import com.zteits.oa.report.vo.OAuthResult; |
33 | 15 | import com.zteits.oa.util.MD5Utils; |
34 | - | |
35 | 16 | import io.swagger.annotations.Api; |
36 | 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 | 32 | @Api("用户登录授权") |
39 | 33 | @RestController |
... | ... | @@ -163,7 +157,7 @@ public class OAuthController { |
163 | 157 | opList.add(dto.getId()); |
164 | 158 | } |
165 | 159 | } |
166 | - queryOpTreeByOpId(queryOpList,opList); | |
160 | + queryOpTreeByOpIds(queryOpList,opList); | |
167 | 161 | } |
168 | 162 | } |
169 | 163 | return opList; | ... | ... |