BJ_ZTEITS-Developers / zteits-oa

Commit 9ce772923472a0b9fe10e2d80d6004411da96762

Authored by xiejianpeng
1 parent 2f6df64b

员工管理

Inline Side-by-side
Showing 5 changed files with 4 additions and 18 deletions
src/main/java/com/zteits/oa/api/dto/asraop/param/AsraOpQueryReq.java
  View file @9ce7729
... ... @@ -11,14 +11,10 @@ public class AsraOpQueryReq extends BaseRequest{
11 11 */
12 12 private static final long serialVersionUID = 7249746348000980054L;
13 13  
14   -<<<<<<< Updated upstream
15 14 /**主键*/
16 15 private Long id;
17 16  
18   - /**登录工号*/
19   -=======
20 17 /**当前登录人的登录工号*/
21   ->>>>>>> Stashed changes
22 18 private String loginCode;
23 19  
24 20 /**登录密码*/
... ...
src/main/java/com/zteits/oa/api/service/report/query/AsraOpQueryService.java
  View file @9ce7729
... ... @@ -32,7 +32,6 @@ public interface AsraOpQueryService {
32 32 * 2018年7月30日 wangfs.<br/>
33 33 */
34 34 BizResult<PageBean<AsraOpDTO>> queryAsraOpForPage(AsraOpQueryReq asraOpQueryReq);
35   -<<<<<<< Updated upstream:src/main/java/com/zteits/oa/api/service/report/query/AsraOpRueryService.java
36 35 /**
37 36 * 获取员工信息.<br/>
38 37 * @param asraOpQueryRe
... ... @@ -41,7 +40,6 @@ public interface AsraOpQueryService {
41 40 */
42 41 BizResult<AsraOpDTO> queryAsraOp(AsraOpQueryReq asraOpQueryRe);
43 42  
44   -=======
45 43  
46 44 /**
47 45 * 根据登录工号查询员工信息
... ... @@ -52,5 +50,4 @@ public interface AsraOpQueryService {
52 50 *
53 51 */
54 52 BizResult<AsraOpDTO> queryAsraOpByLoginCode(AsraOpQueryReq asraOpQueryReq);
55   ->>>>>>> Stashed changes:src/main/java/com/zteits/oa/api/service/report/query/AsraOpQueryService.java
56 53 }
... ...
src/main/java/com/zteits/oa/report/dao/AsraOpDao.java
  View file @9ce7729
... ... @@ -15,8 +15,7 @@ public interface AsraOpDao {
15 15 * 2018年7月30日 wangfs.<br/>
16 16 */
17 17 PageInfo<AsraOp> queryAsraOpForPage(AsraOpQueryReq asraOpQueryReq);
18   -<<<<<<< Updated upstream
19   -
  18 +
20 19 /**
21 20 * 获取员工信息.<br/>
22 21 * @param asraOpQueryRe
... ... @@ -24,7 +23,6 @@ public interface AsraOpDao {
24 23 * 2018年7月31日 wangfs.<br/>
25 24 */
26 25 AsraOp queryAsraOp(AsraOpQueryReq asraOpQueryRe);
27   -=======
28 26  
29 27 /**
30 28 * 根据登录工号查询员工信息
... ... @@ -35,5 +33,4 @@ public interface AsraOpDao {
35 33 *
36 34 */
37 35 AsraOp queryAsraOpByLoginCode(String loginCode);
38   ->>>>>>> Stashed changes
39 36 }
... ...
src/main/java/com/zteits/oa/report/dao/impl/AsraOpDaoImpl.java
  View file @9ce7729
... ... @@ -23,11 +23,7 @@ public class AsraOpDaoImpl implements AsraOpDao {
23 23  
24 24 @Autowired
25 25 private AsraOpSmapper asraOpSmapper;
26   -<<<<<<< Updated upstream
27   -
28   -=======
29 26  
30   ->>>>>>> Stashed changes
31 27 @Autowired
32 28 private AsraOpMapper asraOpMapper;
33 29 /**
... ...
src/main/java/com/zteits/oa/report/web/OAuthController.java
  View file @9ce7729
... ... @@ -3,6 +3,7 @@ package com.zteits.oa.report.web;
3 3 import javax.servlet.http.HttpServletRequest;
4 4 import javax.servlet.http.HttpSession;
5 5  
  6 +import com.zteits.oa.api.service.report.query.AsraOpQueryService;
6 7 import org.slf4j.Logger;
7 8 import org.slf4j.LoggerFactory;
8 9 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -19,7 +20,6 @@ import com.zteits.oa.api.dto.asraop.AsraOpDTO;
19 20 import com.zteits.oa.api.dto.asraop.LoginOathRes;
20 21 import com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq;
21 22 import com.zteits.oa.api.dto.asraop.param.LoginOauthReq;
22   -import com.zteits.oa.api.service.report.query.AsraOpRueryService;
23 23 import com.zteits.oa.util.MD5Utils;
24 24  
25 25 import io.swagger.annotations.Api;
... ... @@ -32,7 +32,7 @@ public class OAuthController {
32 32 private static final Logger logger = LoggerFactory.getLogger(OAuthController.class);
33 33  
34 34 @Autowired
35   - private AsraOpRueryService asraOpRueryService;
  35 + private AsraOpQueryService asraOpQueryService;
36 36  
37 37 @Autowired
38 38 private HttpServletRequest request;
... ... @@ -63,7 +63,7 @@ public class OAuthController {
63 63 boolean isCheckSuccess = false;
64 64 //1.判断登录账号/密码
65 65 asraOpQueryRe.setLoginCode(loginCode);
66   - BizResult<AsraOpDTO> asraOpReult = asraOpRueryService.queryAsraOp(asraOpQueryRe);
  66 + BizResult<AsraOpDTO> asraOpReult = asraOpQueryService.queryAsraOp(asraOpQueryRe);
67 67 if(asraOpReult != null && asraOpReult.getData() != null){
68 68 asraOpDTO = asraOpReult.getData();
69 69 if(StringUtils.isEmpty(asraOpDTO.getLoginCode())){
... ...