Merge branch 'caihaohan' into lixuetao

# Conflicts:
#	adc-da-main/target/classes/application-dev.properties
#	adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
#	adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class
#	adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class
#	adc-da-report/target/classes/com/adc/da/report/util/PdfUtil.class
#	adc-da-report/target/classes/com/adc/da/report/util/PptUtil.class
#	adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml
#	adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
#	adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
#	adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
#	adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
#	adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class
#	adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class
#	adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml
#	pom.xml

adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java

@@ -3,7 +3,11 @@ package com.adc.da.sys.service.iservice;
 import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.vo.UserImportVO;
 import com.adc.da.sys.vo.UserVO;
+import com.adc.da.sys.vo.ddm.DdmUserQueryVO;
+import com.adc.da.sys.vo.ddm.DdmUserVO;
+import com.adc.da.util.http.PageInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -21,6 +25,14 @@ public interface IUserEoService {
      */
     UserEO getUserByLoginName(String userName,String usid);
 
+    /**
+     * 根据邮箱和id查询用户数量
+     * @param email
+     * @param usid
+     * @return
+     */
+    int getUserCountByEmail(String email,String usid);
+
     /**
      * 新增或者编辑用户
      * @param eo
@@ -43,8 +55,13 @@ public interface IUserEoService {
 
     UserEO getUserByLoginNameNotDeleted(String userName);
 
+    public PageInfo<DdmUserVO> getUserPage(DdmUserQueryVO query);
+
     public void importExcelUser(List<UserImportVO> list);
 
     List<Map<String, Object>> allList(String account, String roleName);
 
+    List<UserEO> getUserByMail(List<String> mailList);
+
+    List<UserEO> getUserByAccount(List<String> mailList);
 }

adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml

@@ -163,11 +163,6 @@
             #{id}
         </foreach>
     </select>
-<!--    <select id="getUserEoById" resultMap="BaseResultMap">-->
-<!--        select u.* , org.ORG_NAME as orgName from ts_user u-->
-<!--                                           LEFT JOIN tr_user_org tuo on u.USID = tuo.ORG_ID-->
-<!--                                           LEFT JOIN ts_org org on org.ID = tuo.ORG_ID-->
-<!--        WHERE u.id = #{usid}-->
-<!--    </select>-->
+
 
 </mapper>