Merge branch 'branch0730' of http://192.168.1.195:9998/ZTEITS-Developers/zteits-…

…oa.git into branch0730

Merge branch 'branch0730' of http://192.168.1.195:9998/ZTEITS-Developers/zteits-…
…oa.git into branch0730
王富生
2 parents 9a56ec74 9dc8e4e6
Showing 12 changed files with 638 additions and 26 deletions
src/main/java/com/zteits/oa/api/dto/asradaily/AsraDailyDTO.java
src/main/java/com/zteits/oa/api/dto/asradaily/param/AsraDailyQueryReq.java
src/main/java/com/zteits/oa/api/service/report/query/AsraDailyQueryService.java
src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java
src/main/java/com/zteits/oa/report/biz/AsraOpRelationsQueryServiceImpl.java
src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java
src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
src/main/java/com/zteits/oa/report/web/AsraDailyController.java
src/main/java/com/zteits/oa/report/web/AsraOpController.java
src/main/java/com/zteits/oa/report/web/vo/EasyUIDataGridVO.java
src/main/java/com/zteits/oa/report/web/vo/JqGridDisplayVO.java
src/main/resources/mybatis/smapper/AsraOpSmapper.xml
+package com.zteits.oa.api.dto.asradaily;
+
+import com.zteits.oa.api.base.bean.BaiscDTO;
+
+import java.util.Date;
+
+public class AsraDailyDTO extends BaiscDTO{
+    /**主键*/
+    private Long id;
+
+    /**所属项目ID*/
+    private Long projectId;
+
+    /**所属员工ID*/
+    private Long asarOpId;
+
+    /**操作员姓名*/
+    private String asarOpName;
+
+    /**年:2018*/
+    private Integer years;
+
+    /**周:1-54周*/
+    private Integer weeks;
+
+    /**星期:1-7*/
+    private Integer weeksNum;
+
+    /**工时填写日期*/
+    private Date dailyDate;
+
+    /**数据状态：1有效，0无效,2:锁定*/
+    private Integer dataState;
+
+    /**创建人ID*/
+    private String createEmpid;
+
+    /**创建人*/
+    private String createEmpName;
+
+    /**创建时间*/
+    private Date createDate;
+
+    /**修改人*/
+    private String modfiyEmpid;
+
+    /**修改人*/
+    private String modfiyEmpName;
+
+    /**修改时间*/
+    private Date modfiyDate;
+
+    /**工时内容*/
+    private String dailyContent;
+
+    /**获取主键*/
+    public Long getId() {
+        return id;
+    }
+
+    /**设置主键*/
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**获取所属项目ID*/
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    /**设置所属项目ID*/
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
+    /**获取所属员工ID*/
+    public Long getAsarOpId() {
+        return asarOpId;
+    }
+
+    /**设置所属员工ID*/
+    public void setAsarOpId(Long asarOpId) {
+        this.asarOpId = asarOpId;
+    }
+
+    /**获取操作员姓名*/
+    public String getAsarOpName() {
+        return asarOpName;
+    }
+
+    /**设置操作员姓名*/
+    public void setAsarOpName(String asarOpName) {
+        this.asarOpName = asarOpName == null ? null : asarOpName.trim();
+    }
+
+    /**获取年:2018*/
+    public Integer getYears() {
+        return years;
+    }
+
+    /**设置年:2018*/
+    public void setYears(Integer years) {
+        this.years = years;
+    }
+
+    /**获取周:1-54周*/
+    public Integer getWeeks() {
+        return weeks;
+    }
+
+    /**设置周:1-54周*/
+    public void setWeeks(Integer weeks) {
+        this.weeks = weeks;
+    }
+
+    /**获取星期:1-7*/
+    public Integer getWeeksNum() {
+        return weeksNum;
+    }
+
+    /**设置星期:1-7*/
+    public void setWeeksNum(Integer weeksNum) {
+        this.weeksNum = weeksNum;
+    }
+
+    /**获取工时填写日期*/
+    public Date getDailyDate() {
+        return dailyDate;
+    }
+
+    /**设置工时填写日期*/
+    public void setDailyDate(Date dailyDate) {
+        this.dailyDate = dailyDate;
+    }
+
+    /**获取数据状态：1有效，0无效,2:锁定*/
+    public Integer getDataState() {
+        return dataState;
+    }
+
+    /**设置数据状态：1有效，0无效,2:锁定*/
+    public void setDataState(Integer dataState) {
+        this.dataState = dataState;
+    }
+
+    /**获取创建人ID*/
+    public String getCreateEmpid() {
+        return createEmpid;
+    }
+
+    /**设置创建人ID*/
+    public void setCreateEmpid(String createEmpid) {
+        this.createEmpid = createEmpid == null ? null : createEmpid.trim();
+    }
+
+    /**获取创建人*/
+    public String getCreateEmpName() {
+        return createEmpName;
+    }
+
+    /**设置创建人*/
+    public void setCreateEmpName(String createEmpName) {
+        this.createEmpName = createEmpName == null ? null : createEmpName.trim();
+    }
+
+    /**获取创建时间*/
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    /**设置创建时间*/
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    /**获取修改人*/
+    public String getModfiyEmpid() {
+        return modfiyEmpid;
+    }
+
+    /**设置修改人*/
+    public void setModfiyEmpid(String modfiyEmpid) {
+        this.modfiyEmpid = modfiyEmpid == null ? null : modfiyEmpid.trim();
+    }
+
+    /**获取修改人*/
+    public String getModfiyEmpName() {
+        return modfiyEmpName;
+    }
+
+    /**设置修改人*/
+    public void setModfiyEmpName(String modfiyEmpName) {
+        this.modfiyEmpName = modfiyEmpName == null ? null : modfiyEmpName.trim();
+    }
+
+    /**获取修改时间*/
+    public Date getModfiyDate() {
+        return modfiyDate;
+    }
+
+    /**设置修改时间*/
+    public void setModfiyDate(Date modfiyDate) {
+        this.modfiyDate = modfiyDate;
+    }
+
+    /**获取工时内容*/
+    public String getDailyContent() {
+        return dailyContent;
+    }
+
+    /**设置工时内容*/
+    public void setDailyContent(String dailyContent) {
+        this.dailyContent = dailyContent == null ? null : dailyContent.trim();
+    }
+}
 \ No newline at end of file
+package com.zteits.oa.api.dto.asradaily.param;
+
+import com.zteits.oa.api.base.bean.BaseRequest;
+
+import java.util.Date;
+
+public class AsraDailyQueryReq extends BaseRequest{
+
+
+    /**所属员工ID*/
+    private Long asarOpId;
+
+    /**工时填写日期*/
+    private Date dailyDate;
+
+    /**年:2018*/
+    private Integer years;
+
+    /**周:1-54周*/
+    private Integer weeks;
+
+    public Long getAsarOpId() {
+        return asarOpId;
+    }
+
+    public void setAsarOpId(Long asarOpId) {
+        this.asarOpId = asarOpId;
+    }
+
+    public Date getDailyDate() {
+        return dailyDate;
+    }
+
+    public void setDailyDate(Date dailyDate) {
+        this.dailyDate = dailyDate;
+    }
+
+    public Integer getYears() {
+        return years;
+    }
+
+    public void setYears(Integer years) {
+        this.years = years;
+    }
+
+    public Integer getWeeks() {
+        return weeks;
+    }
+
+    public void setWeeks(Integer weeks) {
+        this.weeks = weeks;
+    }
+}
 \ No newline at end of file
+package com.zteits.oa.api.service.report.query;
+
+import com.zteits.oa.api.base.bean.BizResult;
+import com.zteits.oa.api.base.bean.PageBean;
+import com.zteits.oa.api.dto.asradaily.AsraDailyDTO;
+import com.zteits.oa.api.dto.asradaily.param.AsraDailyQueryReq;
+import com.zteits.oa.api.dto.asraop.AsraOpDTO;
+import com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq;
+
+import java.util.List;
+
+/**
+ * 查询日报
+ * Copyright: Copyright (c) 2018  zteits
+ *
+ * @Description:
+ * @version: v1.0.0
+ * @author: xiejianpeng
+ * @date: 2018/7/31 14:53
+ * Modification History:
+ * Date             Author          Version            Description
+ *---------------------------------------------------------*
+ * 2018/7/31     xiejianpeng         v1.0.0               创建
+ */
+public interface AsraDailyQueryService {
+
+
+	/**
+	 * 根据登录工号和查询时间查询日报
+	 * @param
+	 * @return
+	 * @Author: xiejianpeng
+	 * @Date: 2018/7/31 10:33
+	 *
+	 */
+	BizResult<List<AsraDailyDTO>> queryAsraDailyList(AsraDailyQueryReq asraDailyQueryReq);
+}
+package com.zteits.oa.report.biz;
+
+import com.xiaoleilu.hutool.util.CollectionUtil;
+import com.zteits.oa.api.base.bean.BizResult;
+import com.zteits.oa.api.dto.asradaily.AsraDailyDTO;
+import com.zteits.oa.api.dto.asradaily.param.AsraDailyQueryReq;
+import com.zteits.oa.api.service.report.query.AsraDailyQueryService;
+import com.zteits.oa.report.dao.AsraDailyDao;
+import com.zteits.oa.report.domain.AsraDaily;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Copyright: Copyright (c) 2018  zteits
+ *
+ * @Description:
+ * @version: v1.0.0
+ * @author: xiejianpeng
+ * @date: 2018/7/31 15
+ * Modification History:
+ * Date             Author          Version            Description
+ * ---------------------------------------------------------*
+ * 2018/7/31      xiejianpeng         v1.0.0               创建
+ */
+@Service
+public class AsraDailyQueryServiceImpl implements AsraDailyQueryService {
+
+    @Autowired
+    private AsraDailyDao asraDailyDao;
+
+    @Override
+    public BizResult<List<AsraDailyDTO>> queryAsraDailyList(AsraDailyQueryReq asraDailyQueryReq) {
+        List<AsraDailyDTO> asraDailyDTOs = new ArrayList<>();
+        List<AsraDaily> asraDailies = asraDailyDao.queryAsraDailyList(asraDailyQueryReq);
+        if(CollectionUtil.isNotEmpty(asraDailies)){
+            BeanUtils.copyProperties(asraDailies,asraDailyDTOs,AsraDailyDTO.class);
+        }
+        return new BizResult<>(asraDailyDTOs);
+    }
+}
 package com.zteits.oa.report.biz;
+import com.xiaoleilu.hutool.util.CollectionUtil;
 import com.zteits.oa.api.base.bean.BizResult;
 import com.zteits.oa.api.dto.asraoprelations.AsraOpRelationsDTO;
 import com.zteits.oa.api.dto.asraoprelations.param.AsraOpRelationsQueryReq;
@@ -36,7 +37,9 @@ public class AsraOpRelationsQueryServiceImpl implements AsraOpRelationsQueryServ
         List<AsraOpRelationsDTO> asraOpRelationsDTOs = new ArrayList<>();
         List<AsraOpRelations> asraOpRelationsList = asraOpRelationsDao.queryAsraOpRelations(asraOpRelationsQueryReq.getParentId());
-        BeanUtils.copyProperties(asraOpRelationsList,asraOpRelationsDTOs,AsraOpRelationsDTO.class);
+        if(CollectionUtil.isNotEmpty(asraOpRelationsList)) {
+            BeanUtils.copyProperties(asraOpRelationsList, asraOpRelationsDTOs, AsraOpRelationsDTO.class);
+        }
         return new BizResult<>(asraOpRelationsDTOs);
     }
 }
+package com.zteits.oa.report.dao;
+
+import com.zteits.oa.api.dto.asradaily.param.AsraDailyQueryReq;
+import com.zteits.oa.report.domain.AsraDaily;
+
+import java.util.List;
+
+/**
+ * Copyright: Copyright (c) 2018  zteits
+ *
+ * @Description:
+ * @version: v1.0.0
+ * @author: xiejianpeng
+ * @date: 2018/7/31 15
+ * Modification History:
+ * Date             Author          Version            Description
+ * ---------------------------------------------------------*
+ * 2018/7/31      xiejianpeng         v1.0.0               创建
+ */
+public interface AsraDailyDao {
+
+    /**
+     * 根据登录工号和查询时间查询日报
+     * @param
+     * @return
+     * @Author: xiejianpeng
+     * @Date: 2018/7/31 15:22
+     *
+     */
+    List<AsraDaily> queryAsraDailyList(AsraDailyQueryReq asraDailyQueryReq);
+}
+package com.zteits.oa.report.dao.impl;
+
+import com.zteits.oa.api.dto.asradaily.param.AsraDailyQueryReq;
+import com.zteits.oa.report.dao.AsraDailyDao;
+import com.zteits.oa.report.domain.AsraDaily;
+import com.zteits.oa.report.domain.AsraDailyExample;
+import com.zteits.oa.report.mapper.AsraDailyMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Copyright: Copyright (c) 2018  zteits
+ *
+ * @Description:
+ * @version: v1.0.0
+ * @author: xiejianpeng
+ * @date: 2018/7/31 15
+ * Modification History:
+ * Date             Author          Version            Description
+ * ---------------------------------------------------------*
+ * 2018/7/31      xiejianpeng         v1.0.0               创建
+ */
+@Component
+public class AsraDailyDaoImpl implements AsraDailyDao{
+
+    @Autowired
+    private AsraDailyMapper asraDailyMapper;
+
+
+    @Override
+    public List<AsraDaily> queryAsraDailyList(AsraDailyQueryReq asraDailyQueryReq) {
+        AsraDailyExample example = new AsraDailyExample();
+        example.createCriteria().andAsarOpIdEqualTo(asraDailyQueryReq.getAsarOpId())
+                .andYearsEqualTo(asraDailyQueryReq.getYears())
+                .andWeeksEqualTo(asraDailyQueryReq.getWeeks());
+        return asraDailyMapper.selectByExample(example);
+    }
+}
+package com.zteits.oa.report.web;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xiaoleilu.hutool.date.DateUtil;
+import com.xiaoleilu.hutool.util.CollectionUtil;
+import com.zteits.oa.api.base.bean.BizResult;
+import com.zteits.oa.api.base.bean.PageBean;
+import com.zteits.oa.api.base.constants.SessionEnum;
+import com.zteits.oa.api.dto.asradaily.AsraDailyDTO;
+import com.zteits.oa.api.dto.asradaily.param.AsraDailyQueryReq;
+import com.zteits.oa.api.dto.asraop.AsraOpDTO;
+import com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq;
+import com.zteits.oa.api.dto.asraoprelations.AsraOpRelationsDTO;
+import com.zteits.oa.api.dto.asraoprelations.param.AsraOpRelationsQueryReq;
+import com.zteits.oa.api.service.report.query.AsraDailyQueryService;
+import com.zteits.oa.api.service.report.query.AsraOpQueryService;
+import com.zteits.oa.api.service.report.query.AsraOpRelationsQueryService;
+import com.zteits.oa.report.domain.AsraDaily;
+import io.swagger.annotations.Api;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Api(value = "日报系统-日报管理", description = "日报系统-日报管理")
+@RestController
+@RequestMapping("/asraDaily")
+public class AsraDailyController {
+
+	private static final Logger logger = LoggerFactory.getLogger(AsraDailyController.class);
+
+	@Autowired
+	private AsraOpQueryService asraOpQueryService;
+
+	@Autowired
+	private AsraDailyQueryService asraDailyQueryService;
+
+
+	@RequestMapping(value="/queryAsraDailyList",method = RequestMethod.POST)
+	public BizResult<List<AsraDailyDTO>> queryAsraDailyList(@RequestBody AsraDailyQueryReq asraDailyQueryReq, HttpServletRequest request){
+		logger.info("日报系统-日报管理-根据登录人分页查询员工信息入参:{}", JSONObject.toJSON(asraDailyQueryReq));
+		/**1.根据当前登录人查询登录人下面管理的员工-缓存中获取*/
+		AsraOpDTO asraOpDTO = (AsraOpDTO)request.getSession().getAttribute(SessionEnum.USER_INFO.key());
+
+		/**2.判断登录人和时间查询日报*/
+		Date dailyDate = asraDailyQueryReq.getDailyDate();
+		Integer week = DateUtil.weekOfYear(dailyDate);//第N周
+		Integer year = DateUtil.year(dailyDate);//第N周
+		asraDailyQueryReq.setAsarOpId(asraOpDTO.getId());
+		asraDailyQueryReq.setWeeks(week);
+		asraDailyQueryReq.setYears(year);
+		BizResult<List<AsraDailyDTO>> result = asraDailyQueryService.queryAsraDailyList(asraDailyQueryReq);
+		logger.info("日报系统-日报管理-根据登录人分页查询员工信息结束");
+		return result;
+	}
+
+}
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.xiaoleilu.hutool.util.CollectionUtil;
 import com.zteits.oa.api.base.bean.BizResult;
 import com.zteits.oa.api.base.bean.PageBean;
+import com.zteits.oa.api.base.constants.SessionEnum;
 import com.zteits.oa.api.dto.asraop.AsraOpDTO;
 import com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq;
 import com.zteits.oa.api.dto.asraoprelations.AsraOpRelationsDTO;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,23 +47,24 @@ public class AsraOpController {
 	public BizResult<PageBean<AsraOpDTO>> queryAsraOpPage(@RequestBody AsraOpQueryReq asraOpQueryReq, HttpServletRequest request){
 		logger.info("日报系统-员工管理-根据登录人分页查询员工信息入参:{}", JSONObject.toJSON(asraOpQueryReq));
 		/**1.根据当前登录人查询登录人下面管理的员工-缓存中获取*/
+		AsraOpDTO asraOpDTO = (AsraOpDTO)request.getSession().getAttribute(SessionEnum.USER_INFO.key());
-		AsraOpDTO asraOpDTO = null;
-
-		/**2.判断登录人是领导还是员工 ,2:员工,1:领导*/
-		List<Long> opIdLists = new ArrayList<>();
-		opIdLists.add(asraOpDTO.getId());
-		if(asraOpDTO.getRoleId() == 1){
-			/**如果是领导,获取领导下面的员工信息*/
-			AsraOpRelationsQueryReq asraOpRelationsQueryReq = new AsraOpRelationsQueryReq();
-			asraOpRelationsQueryReq.setParentId(asraOpDTO.getId());
-			BizResult<List<AsraOpRelationsDTO>> listBizResult = asraOpRelationsQueryService.queryAsraOpRelations(asraOpRelationsQueryReq);
-			if(listBizResult.isSuccess() && CollectionUtil.isNotEmpty(listBizResult.getData())){
-				for(AsraOpRelationsDTO asraOpRelationsDTO : listBizResult.getData()){
-					opIdLists.add(asraOpRelationsDTO.getOpId());
-				}
-			}
-		}
+//		/**2.判断登录人是领导还是员工 ,2:员工,1:领导*/
+//		List<Long> opIdLists = new ArrayList<>();
+//		opIdLists.add(asraOpDTO.getId());
+//		if(asraOpDTO.getRoleId() == 1){
+//			/**如果是领导,获取领导下面的员工信息*/
+//			AsraOpRelationsQueryReq asraOpRelationsQueryReq = new AsraOpRelationsQueryReq();
+//			asraOpRelationsQueryReq.setParentId(asraOpDTO.getId());
+//			BizResult<List<AsraOpRelationsDTO>> listBizResult = asraOpRelationsQueryService.queryAsraOpRelations(asraOpRelationsQueryReq);
+//			if(listBizResult.isSuccess() && CollectionUtil.isNotEmpty(listBizResult.getData())){
+//				for(AsraOpRelationsDTO asraOpRelationsDTO : listBizResult.getData()){
+//					opIdLists.add(asraOpRelationsDTO.getOpId());
+//				}
+//			}
+//		}
+//		asraOpQueryReq.setOpIdLists(opIdLists);
+		asraOpQueryReq.setId(asraOpDTO.getId());
 		BizResult<PageBean<AsraOpDTO>>  result = asraOpQueryService.queryAsraOpForPage(asraOpQueryReq);
 		logger.info("日报系统-员工管理-根据登录人分页查询员工信息结果:{}", JSONObject.toJSON(result));
 		return result;
+package com.zteits.oa.report.web.vo;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Copyright: Copyright (c) 2017  zteits
+ * 
+ * @ClassName: JqGridDisplayVO.java
+ * @Description: JqGrid 对应前台数据传输格式
+ * @version: v1.0.0
+ * @author: zhaowg
+ * @date: 2017年5月12日   上午11:20:33 
+ * Modification History: 
+ * Date             Author          Version            Description
+ *---------------------------------------------------------*
+ * 2017年5月12日      zhaowg              v1.0.0               创建
+ */
+public class EasyUIDataGridVO<T> implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+	//总页数
+	private Integer total;
+	
+	//包含实际数据的数组
+	private List<T> rows;
+
+	public Integer getTotal() {
+		return total;
+	}
+
+	public void setTotal(Integer total) {
+		this.total = total;
+	}
+
+	public List<T> getRows() {
+		return rows;
+	}
+
+	public void setRows(List<T> rows) {
+		this.rows = rows;
+	}
+	
+}
+package com.zteits.oa.report.web.vo;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Copyright: Copyright (c) 2017  zteits
+ * 
+ * @ClassName: JqGridDisplayVO.java
+ * @Description: JqGrid 对应前台数据传输格式
+ * @version: v1.0.0
+ * @author: zhaowg
+ * @date: 2017年5月12日   上午11:20:33 
+ * Modification History: 
+ * Date             Author          Version            Description
+ *---------------------------------------------------------*
+ * 2017年5月12日      zhaowg              v1.0.0               创建
+ */
+public class JqGridDisplayVO<T> implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+	//总页数
+	private Integer total;
+	
+	//当前页
+	private Integer page;
+	
+	//总记录条数
+	private Integer records;
+	
+	//包含实际数据的数组
+	private List<T> rows;
+
+	public Integer getTotal() {
+		return total;
+	}
+
+	public void setTotal(Integer total) {
+		this.total = total;
+	}
+
+	public Integer getPage() {
+		return page;
+	}
+
+	public void setPage(Integer page) {
+		this.page = page;
+	}
+
+	public Integer getRecords() {
+		return records;
+	}
+
+	public void setRecords(Integer records) {
+		this.records = records;
+	}
+
+	public List<T> getRows() {
+		return rows;
+	}
+
+	public void setRows(List<T> rows) {
+		this.rows = rows;
+	}
+	
+}
@@ -27,21 +27,31 @@
   </sql>
   <select id="queryAsraOpForList" parameterType="com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from asra_op
-    where 1=1
+    select
+    ap.id id,
+    ap.login_code loginCode,
+    ap.op_name opName,
+    ap.email email,
+    ap.role_id roleId,
+    ap.city_id cityId,
+    ap.city_name cityName,
+    ap.is_remind_email isRemindEmail
+    from asra_op ap,asra_op_relations apr
+    where 1=1 and ap.id = apr.op_id
+      <if test="id != null ">
+        and apr.parent_id = #{id} or ap.id = #{id}
+      </if>
       <if test="loginCode != null and loginCode !=''">
-        and login_code = #{loginCode,jdbcType=VARCHAR}
+        and ap.login_code = #{loginCode,jdbcType=VARCHAR}
       </if>
       <if test="opName != null and opName != ''">
-        and op_name ike concat('${opName}','%')
+        and ap.op_name ike concat('${opName}','%')
       </if>
       <if test="email != null and email != ''">
-        and email = #{email,jdbcType=VARCHAR}
+        and ap.email = #{email,jdbcType=VARCHAR}
       </if>
-      <if test="opIdLists != null and opIdLists.size >0">
-        and id in
+      <if test="opIdLists != null">
+        and ap.id in
         <foreach collection="opIdLists" item="opId"  open="(" close=")" separator="," >
           #{opId}
         </foreach>