Merge remote-tracking branch 'origin/dev/one' into dev/one

user-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -39,7 +39,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/user/getUserAndOrg").permitAll()
                 .antMatchers("/user/getUserByOrgName").permitAll()
                 .antMatchers("/user/resetPassword").permitAll()
-                .antMatchers("/user/verifyUser").permitAll()
+                .antMatchers("/user/verifyNoUsername").permitAll()
+                .antMatchers("/user/verifyExistUsername").permitAll()
                 .antMatchers("/**").authenticated();
         //        .antMatchers("/**").permitAll();
     }

user-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -83,7 +83,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/user/index", request)
                 || matchers("/user/getUserByOrgName", request)
                 || matchers("/user/getUserAndOrg", request)
-                || matchers("/user/verifyUser", request)
+                || matchers("/user/verifyNoUsername", request)
+                || matchers("/user/verifyExistUsername", request)
                 || matchers("/", request)) {
             return true;
         }

user-service/src/main/java/com/diagbot/dto/OrganizationDTO.java

@@ -15,15 +15,16 @@ import lombok.Setter;
 @Setter
 public class OrganizationDTO {
 	
-	 private Long userId;//用户ID
-	 private String linkman;//联系人
 	 private Long orgId;//机构ID
 	 private Date orgGmtCreate;//记录创建时间
 	 private String orgName;//机构名称
-	 private Integer orgType;//机构属性
 	 private String orgPrincipal;//负责人
+	 private Integer orgType;//机构属性
 	 private String orgAddress;//机构地址
+	 private String autStatus;// 状态
+	 private String linkman;//联系人
 	 private Long orgParentId;//上级机构id
 	 private Integer orgSubNum;//下属机构数量
+	 private Long userId;//用户ID
 
 }

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -123,8 +123,7 @@ public class UserFacade extends UserServiceImpl {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请输入正确的手机号");
         }
 
-        //TODO 测试注释了图形验证和短信验证，后面要开启
-        //        verFacade.verifyImgVerification(imgVerVerVO); //保存时再次校验图形验证码，主要是为了防止跳过前端校验直接调用接口
+        verFacade.verifyImgVerification(imgVerVerVO); //保存时再次校验图形验证码，主要是为了防止跳过前端校验直接调用接口
 
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword = passwordEncoder.encode(user.getPassword());
@@ -144,12 +143,12 @@ public class UserFacade extends UserServiceImpl {
 
 
     /**
-     * 校验用户(手机号）是否注册
+     * 校验用户(手机号）未注册
      *
      * @param usernameVO 参数
      * @return 返回状态
      */
-    public Boolean verifyUser(UsernameVO usernameVO) {
+    public Boolean verifyNoUser(UsernameVO usernameVO) {
         String username = usernameVO.getUsername();
         if(StringUtil.isEmpty(username)) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请输入手机号");
@@ -165,6 +164,28 @@ public class UserFacade extends UserServiceImpl {
     }
 
 
+
+    /**
+     * 校验用户(手机号）已注册
+     *
+     * @param usernameVO 参数
+     * @return 返回状态
+     */
+    public Boolean verifyExistUser(UsernameVO usernameVO) {
+        String username = usernameVO.getUsername();
+        if(StringUtil.isEmpty(username)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请输入手机号");
+        }
+        if(!RegexValidateUtil.checkMobileNumber(username)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请输入正确的手机号");
+        }
+        User bean = findByName(username);
+        if (bean == null) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该手机未注册");
+        }
+        return true;
+    }
+
     /**
      * @param page       分页参数
      * @param userSaveVO 参数
@@ -782,13 +803,14 @@ public class UserFacade extends UserServiceImpl {
     }
 
     /**
+     * 添加机构信息
      * @param organizationVO
      * @return
      */
     public RespDTO<Boolean> addOrganizations(OrganizationVO organizationVO) {
 
         String organizationName = organizationVO.getOrganizationName();
-        List<Organization> organizationList = organizationFacade.findOrganization(organizationName);
+        List<Organization> organizationList = organizationFacade.findOrganizationAll(organizationName);
         if (ListUtil.isNotEmpty(organizationList)) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该机构存在");
         }
@@ -811,8 +833,9 @@ public class UserFacade extends UserServiceImpl {
     }
 
     /**
+     * 添加用户信息和机构信息管理员
      * @param userAndOrganizationVO
-     * @return 添加用户信息和机构信息管理员
+     * @return 
      */
     public RespDTO<Boolean> addUserInfos(UserAndOrganizationVO userAndOrganizationVO) {
         // TODO 先查找机构，获取机构id,再注册用户,返回用户id, 取到用户id和 机构id ,查询用户机构关联表，在进行绑定
@@ -865,6 +888,14 @@ public class UserFacade extends UserServiceImpl {
             userOrganization.setUserId(userId);// 用户id
 
             res = userOrganizationFacade.save(userOrganization);
+
+            UserRole userRole = new UserRole();
+            userRole.setUserId(user.getId());
+            userRole.setRoleId(1L);
+            userRole.setGmtCreate(new Date());
+            userRole.setCreator(UserUtils.getCurrentPrincipleID());
+            userRoleFacade.save(userRole);
+
         } else {
             throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
         }
@@ -939,10 +970,10 @@ public class UserFacade extends UserServiceImpl {
      * @param autStatus
      * @return
      */
-    public RespDTO<IPage<UserAllDTO>> queryUserInformations(Page page, String orgName, Integer autStatus,String startTime,String endTime){
+    public RespDTO<IPage<UserAllDTO>> queryUserInformations(Page page, String userName, Integer autStatus,String startTime,String endTime){
     	CustomerDTO userInfo = new CustomerDTO();
-    	if(orgName != null && orgName.length() != 0){
-    		userInfo.setOrgName(orgName);
+    	if(userName != null && userName.length() != 0){
+    		userInfo.setUserName(userName);
     	}
         if(!autStatus.equals("")){
             userInfo.setAutStatus(autStatus);
@@ -1055,7 +1086,7 @@ public class UserFacade extends UserServiceImpl {
 	}
 
 /**
- * 用户信息
+ * 导出用户信息
  * @param userExportVO
  * @param response
  */
@@ -1112,10 +1143,10 @@ public class UserFacade extends UserServiceImpl {
 		  Map<String, Object> userMap = new HashMap<String, Object>();
 	        userMap.put("startTime", userExportVO.getStartTime());
 	        userMap.put("endTime", userExportVO.getEndTime());
-	        userMap.put("autStatus",userExportVO.getAutStatus());
+	        /*userMap.put("autStatus",userExportVO.getAutStatus());*/
 	        userMap.put("orgName",userExportVO.getOrgName());
-	        userMap.put("userName",userExportVO.getUserName());
-	        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
+	        /*userMap.put("userName",userExportVO.getUserName());*/
+	        List<UserInfoDTO> datas = exportOrganizations(userMap);
 	        GsonUtil.toJson(datas);
 	        List<String> listName = new ArrayList<>();
 
@@ -1152,7 +1183,7 @@ public class UserFacade extends UserServiceImpl {
 	        }
 	        response.setContentType("text/html;charset=UTF-8");
 	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-	        ex.exportExcelNew("用户信息详情", listName, listId, list,response);
+	        ex.exportExcelNew("机构信息详情", listName, listId, list,response);
 		
 	}
 
@@ -1251,18 +1282,13 @@ public class UserFacade extends UserServiceImpl {
 	                    userInfo.getEmail(),
 	                    AuthStatusEnum.getName(userInfo.getAutStatus())));
 	        }
-	        //response.setContentType("text/html;charset=UTF-8");
-	/*        String filePath = userExportVO.getFilePath();//文件路径
-	        String fileName = userExportVO.getFileName();//文件名
-	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-	        RespDTO resul = ex.exportExcel("测试POI导出EXCEL文档", listName, listId, list, filePath, fileName);*/
 	        response.setContentType("text/html;charset=UTF-8");
 	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-	        ex.exportExcelNew("用户信息详情", listName, listId, list,response);
+	        ex.exportExcelNew("已认证用户信息", listName, listId, list,response);
 		
 	}
 
-    //超管修改用户信息
+    //超管修改用户信息接口
 	public RespDTO<Boolean> updateUserInfos(AmendUserInfoVO amendUserInfoVO) {
 		 Map<String, Object> amendUserInfo = new HashMap<String, Object>();
 		 amendUserInfo.put("modifier", UserUtils.getCurrentPrincipleID());

user-service/src/main/java/com/diagbot/mapper/OrganizationMapper.java

@@ -23,9 +23,16 @@ public interface OrganizationMapper extends BaseMapper<Organization> {
     public Organization getByUserId(Long userId);
 
     /**
-     * @Description: 模糊查询机构名称
+     * @Description: 模糊查询未绑定用户的机构名称
      * @Author: wangfeng
      * @Date: 2018/9/19 15:24
      */
     public List<Organization> findOrganization(String organizationName);
+    
+    /**
+     * 模糊查询机构名称
+     * @param organizationName
+     * @return
+     */
+	public List<Organization> findOrganizationAll(String organizationName);
 }

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -52,30 +52,42 @@ public interface UserMapper extends BaseMapper<User> {
 
     public boolean updateUserInfoAll(@Param("userMap") Map<String, Object> userMap);
 
+    //删除用户信息和机构信息
     public boolean updateDeleted(@Param("map") Map<String, Object> map);
 
     public List<User> getByIds(List<Long> ids);
 
     public List<UserOrgDTO> getUserOrgDTOByIds(List<Long> ids);
-
+    
+    //审核用户信息和机构信息
     public boolean auditUserInfoAll(@Param("auditMap") Map<String, Object> auditMap);
 
     public Integer updateById(Map<String, String> map);
-
+    
+    //导出用户和机构信息
     public List<UserInfoDTO> dependentuserInfoByTime(@Param("userExport") Map<String, Object> map);
 
     public List<User> getUserByOrgName(String orgName);
     
+    //分页查询注册用户信息接口
     public IPage<UserAllDTO> queryUserInformation(Page page, @Param("userInformation") CustomerDTO userInfo);
     
+    ////分页查询机构信息接口
     public IPage<OrganizationDTO> queryMechanismInformation(Page page, @Param("mechanism")  CustomerDTO userInfo);
     
+    //分页查询已认证用户信息和机构信息及开通产品接口
     public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, @Param("userOrg")  CustomerDTO userInfo);
     
+    //分页查询认证中的用户信息接口
     public IPage<AuthenticationDTO> queryAuthentication(Page page, @Param("authen")  CustomerDTO userInfo);
     
+    //超管修改用户信息接口
     public boolean updateUserInfo (@Param("amendUserInfo") Map<String, Object> amendUserInfo);
     
+    //机构信息修改接口
     public boolean updateOrganizations (@Param("amendOrg") Map<String, Object> amendOrg);
 
+    //导出机构信息接口
+	public List<UserInfoDTO> exportOrganizations(@Param("exportOrg") Map<String, Object> exportOrg);
+
 }

user-service/src/main/java/com/diagbot/service/OrganizationService.java

@@ -30,9 +30,16 @@ public interface OrganizationService extends IService<Organization> {
 
 
     /**
-     * @Description: 模糊查询机构名称
+     * @Description: 模糊查询未绑定用户的机构名称
      * @Author: wangfeng
      * @Date: 2018/9/19 15:24
      */
     public List<Organization> findOrganization(String organizationName);
+    
+    /**
+     * 模糊查询机构名称
+     * @param organizationName
+     * @return
+     */
+    public List<Organization> findOrganizationAll(String organizationName);
 }

user-service/src/main/java/com/diagbot/service/UserOrganizationService.java

@@ -20,5 +20,10 @@ public interface UserOrganizationService extends IService<UserOrganization> {
      */
     public List<UserOrganization> selectByMap(Map map);
 
+    /**
+     * 根据机构id查绑定的用户
+     * @param userORG
+     * @return
+     */
     public List<UserOrganization> getAgencyPersonnel(UserOrganization userORG);
 }

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -73,4 +73,6 @@ public interface UserService extends IService<User> {
     public boolean updateUserInfo (Map<String, Object> amendUserInfo);
     
     public boolean updateOrganizations (Map<String, Object> amendOrg);
+    
+    public List<UserInfoDTO> exportOrganizations(Map<String, Object> map);
 }

user-service/src/main/java/com/diagbot/service/impl/OrganizationServiceImpl.java

@@ -41,12 +41,20 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
 
 
     /**
-     * @Description: 模糊查询机构名称
+     * @Description: 模糊查询未绑定用户的机构名称
      * @Author: wangfeng
      * @Date: 2018/9/19 15:24
      */
     public List<Organization> findOrganization(String organizationName) {
         return baseMapper.findOrganization(organizationName);
     }
+    /**
+     * 模糊查询机构名称
+     * @param organizationName
+     * @return
+     */
+    public List<Organization> findOrganizationAll(String organizationName) {
+        return baseMapper.findOrganizationAll(organizationName);
+    }
 
 }

user-service/src/main/java/com/diagbot/service/impl/UserOrganizationServiceImpl.java

@@ -28,7 +28,7 @@ public class UserOrganizationServiceImpl extends ServiceImpl<UserOrganizationMap
     public List<UserOrganization> selectByMap(Map map) {
         return baseMapper.selectByMap(map);
     }
-
+    //根据机构id查绑定的用户
     @Override
     public List<UserOrganization> getAgencyPersonnel(UserOrganization userORG) {
         return baseMapper.getAgencyPersonnel(userORG);

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -63,6 +63,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     }
 
+    //删除用户信息和机构信息
     @Override
     public boolean updateDeleted(Map<String, Object> map) {
         return baseMapper.updateDeleted(map);
@@ -90,13 +91,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public List<UserOrgDTO> getUserOrgByIds(List<Long> userIds) {
         return baseMapper.getUserOrgDTOByIds(userIds);
     }
-
+    
+    //审核用户信息和机构信息
     @Override
     public boolean auditUserInfoAll(Map<String, Object> auditMap) {
         // TODO Auto-generated method stub
         return baseMapper.auditUserInfoAll(auditMap);
     }
-
+    //导出用户和机构信息
     @Override
     public List<UserInfoDTO> dependentuserInfoByTime(Map<String, Object> map) {
 
@@ -107,39 +109,50 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public List<User> getUserByOrgName(String orgName) {
         return baseMapper.getUserByOrgName(orgName);
     }
-    
+    //分页查询注册用户信息接口
     @Override
     public IPage<UserAllDTO> queryUserInformation(Page page, CustomerDTO userInfo){
     	 return baseMapper.queryUserInformation(page, userInfo);
     }
-    
+    //分页查询机构信息接口
+    @Override
     public IPage<OrganizationDTO> queryMechanismInformation(Page page, CustomerDTO userInfo){
     	return baseMapper.queryMechanismInformation(page, userInfo);
     }
 
+    //分页查询已认证用户信息和机构信息及开通产品接口
 	@Override
 	public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, CustomerDTO userInfo) {
 		
 		return baseMapper.queryVerifiedUserOrganizationProduct(page, userInfo);
 	}
 
+	//分页查询认证中的用户信息接口
 	@Override
 	public IPage<AuthenticationDTO> queryAuthentication(Page page, CustomerDTO userInfo) {
 		
 		return baseMapper.queryAuthentication(page, userInfo);
 	}
 
+	//超管修改用户信息接口
 	@Override
 	public boolean updateUserInfo(Map<String, Object> amendUserInfo) {
 		// TODO Auto-generated method stub
 		return baseMapper.updateUserInfo(amendUserInfo);
 	}
 
+	//机构信息修改接口
 	@Override
 	public boolean updateOrganizations(Map<String, Object> amendOrg) {
 		// TODO Auto-generated method stub
 		return baseMapper.updateOrganizations(amendOrg);
 	}
+
+	@Override
+	public List<UserInfoDTO> exportOrganizations(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		return baseMapper.exportOrganizations(map);
+	}
 	
 
 

user-service/src/main/java/com/diagbot/vo/AmendOrgVO.java

@@ -18,7 +18,7 @@ import lombok.Setter;
 @Setter
 public class AmendOrgVO {
 
-    @NotNull(message = "请输入机构id!")
+    @NotNull(message = "请输入机构id")
 	 private Long orgId;//机构ID
 	 private Integer orgType;//机构属性
 	 private String orgAddress;//机构地址

user-service/src/main/java/com/diagbot/vo/AmendUserInfoVO.java

@@ -17,7 +17,7 @@ import lombok.Setter;
 @Setter
 public class AmendUserInfoVO {
 	
-	@NotNull(message = "请输入用户id!")
+	@NotNull(message = "请输入用户id")
 	private Long userId;//用户ID
     private String linKman;//联系人
     private String email;// 邮箱

user-service/src/main/java/com/diagbot/vo/UserInfoPagVO.java

@@ -12,6 +12,7 @@ import lombok.Setter;
 @Getter
 @Setter
 public class UserInfoPagVO extends Page {
+	String userName;
     String orgName;
     Integer autStatus;
 	String startTime;//开始时间

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -72,16 +72,25 @@ public class UserController {
     }
 
 
-    @ApiOperation(value = "校验用户(手机号)是否注册[by:zhoutg]",
+    @ApiOperation(value = "校验用户(手机号)已注册[by:zhoutg]",
             notes = "username：用户名(手机号)，必填<br>")
-    @PostMapping("/verifyUser")
-    @SysLogger("verifyUser")
-    public RespDTO<Boolean> verifyUser(@RequestBody UsernameVO usernameVO) {
-        Boolean res = userFacade.verifyUser(usernameVO);
+    @PostMapping("/verifyExistUsername")
+    @SysLogger("verifyExistUsername")
+    public RespDTO<Boolean> verifyExistUser(@RequestBody UsernameVO usernameVO) {
+        Boolean res = userFacade.verifyExistUser(usernameVO);
         return RespDTO.onSuc(res);
     }
 
 
+    @ApiOperation(value = "校验用户(手机号)未注册[by:zhoutg]",
+            notes = "username：用户名(手机号)，必填<br>")
+    @PostMapping("/verifyNoUsername")
+    @SysLogger("verifyNoUsername")
+    public RespDTO<Boolean> verifyUser(@RequestBody UsernameVO usernameVO) {
+        Boolean res = userFacade.verifyNoUser(usernameVO);
+        return RespDTO.onSuc(res);
+    }
+
     @ApiOperation(value = "登录获取jwt[by:zhoutg]",
             notes = "username：用户名,必填<br>" +
                     "password：密码, 必填<br> ")

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -52,7 +52,7 @@ import springfox.documentation.annotations.ApiIgnore;
  * @time: 2018年9月17日 下午1:53:53
  */
 @RestController
-@Api(value = "客户中心API[by:wangfeng]", tags = { "注册用户信息和机构信息API" })
+@Api(value = "客户中心API[by:wangfeng]", tags = { "客户中心API" })
 @RequestMapping("/userInfo")
 @SuppressWarnings("unchecked")
 public class UserInfoController {
@@ -104,7 +104,7 @@ public class UserInfoController {
         return userFacade.updateDeleteds(baseIdVO);
     }
 
-    @ApiOperation(value = "模糊查询机构信息[by:wangfeng]", notes = "机构信息")
+    @ApiOperation(value = "模糊查询未绑定用户的机构名称[by:wangfeng]", notes = "机构信息")
     @PostMapping("/findOrganization")
     @SysLogger("findOrganization")
     public RespDTO<Organization> findOrganization(@RequestBody OrganizationNameVO organizationNameVO) {
@@ -115,7 +115,7 @@ public class UserInfoController {
         return RespDTO.onSuc(organization);
     }
 
-    @ApiOperation(value = "添加构信息[by:wangfeng]", notes = "机构信息")
+    @ApiOperation(value = "添加机构信息[by:wangfeng]", notes = "机构信息")
     @PostMapping("/addOrganization")
     @SysLogger("addOrganization")
     @Transactional
@@ -148,7 +148,7 @@ public class UserInfoController {
     @SysLogger("queryUserInformation")
     public RespDTO<IPage<UserAllDTO>> queryUserInformation(@RequestBody UserInfoPagVO userInfoPagVO){
     	
-    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getOrgName(), userInfoPagVO.getAutStatus(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
+    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getUserName(), userInfoPagVO.getAutStatus(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
     }
     
     
@@ -177,7 +177,7 @@ public class UserInfoController {
 		return userFacade.queryAuthentications(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName(),userAndOrgPageVO.getStartTime(),userAndOrgPageVO.getEndTime());
 	} 
     
-    @ApiOperation(value = "超管信息修改接口[by:wangfeng]", notes = "用户id必传")
+    @ApiOperation(value = "超管修改用户信息接口[by:wangfeng]", notes = "用户id必传")
     @PostMapping("/updateUserInfo")
     @SysLogger("updateUserInfo")
     @Transactional

user-service/src/main/resources/mapper/OrganizationMapper.xml

@@ -32,4 +32,9 @@
 	= "N" AND b.organization_id IS NULL AND a.NAME LIKE CONCAT('%',
 	#{organizationName}, '%')
 	</select>
+	<select id="findOrganizationAll" parameterType="java.lang.String"
+	resultType="com.diagbot.entity.Organization">
+	SELECT id,NAME FROM sys_organization WHERE is_deleted = "N" AND NAME LIKE
+	CONCAT('%', #{organizationName}, '%')
+    </select>
 </mapper>

user-service/src/main/resources/mapper/UserMapper.xml

@@ -315,7 +315,7 @@
         ORDER BY u.gmt_create DESC  
     </select>
     
-   <select id="queryMechanismInformation" resultType="com.diagbot.dto.OrganizationDTO">
+   <!-- <select id="queryMechanismInformation(jiude)" resultType="com.diagbot.dto.OrganizationDTO">
     SELECT
         u.id AS userId,
         u.linkman AS linKman,
@@ -342,7 +342,37 @@
             AND u.gmt_create BETWEEN #{mechanism.startTime} and #{mechanism.endTime}
         </if>
         ORDER BY u.gmt_create DESC 
-   </select>
+   </select> -->
+   <select id="queryMechanismInformation" resultType="com.diagbot.dto.OrganizationDTO">
+      SELECT  
+        u.id AS userId,
+        org.id AS orgId,
+        org.gmt_create AS orgGmtCreate,
+        org.name AS orgName,
+        org.principal AS orgPrincipal,
+        org.type AS orgType,
+        org.address AS orgAddress,
+        u.linkman AS linkman,
+        aut.status AS autStatus,
+        org.parent_id AS orgParent_id,
+        org.sub_num AS orgSub_num
+        FROM 
+        sys_organization org 
+        LEFT JOIN  sys_user_organization uorg  ON org.id = uorg.organization_id
+        LEFT JOIN sys_user u ON uorg.user_id = u.id
+        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
+        WHERE org.is_deleted = 'N' 
+        <if test="mechanism.orgName != null">
+            AND org.name LIKE CONCAT('%', #{mechanism.orgName}, '%')
+        </if>
+        <if test="mechanism.autStatus != null">
+            AND aut.status = #{mechanism.autStatus}
+        </if>
+         <if test="mechanism.startTime != null and mechanism.endTime != null">
+            AND org.gmt_create BETWEEN #{mechanism.startTime} and #{mechanism.endTime}
+        </if>
+        ORDER BY org.gmt_create DESC 
+   </select> 
     
     <select id="queryVerifiedUserOrganizationProduct" resultType="com.diagbot.dto.UserOrgizationProductDTO">
      SELECT
@@ -468,4 +498,38 @@
 		a.is_deleted = "N"
 		AND a.id = #{amendOrg.orgId}
 	</update>
+	<select id="exportOrganization" parameterType="java.util.Map"
+            resultType="com.diagbot.dto.UserInfoDTO">
+	SELECT
+        u.id AS userId,
+        u.gmt_create AS userGmtCreate,
+        u.gmt_modified AS userGmtModified,
+        u.username AS userName,
+        u.linkman AS linKman,
+        u.email AS email,
+        org.id AS orgId,
+        org.gmt_create AS orgGmtCreate,
+        org.name AS orgName,
+        org.type AS orgType,
+        org.principal AS orgPrincipal,
+        org.address AS orgAddress,
+        org.parent_id AS orgParent_id,
+        org.sub_num AS orgSub_num,
+        aut.position AS autPosition,
+        aut.is_reject AS autIsReject,
+        aut.status AS autStatus
+        FROM 
+        sys_organization org 
+        LEFT JOIN  sys_user_organization uorg  ON org.id = uorg.organization_id
+        LEFT JOIN sys_user u ON uorg.user_id = u.id
+        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
+        WHERE org.is_deleted = 'N' 
+        <if test="exportOrg.orgName != null">
+            AND org.name LIKE CONCAT('%', #{exportOrg.orgName}, '%')
+        </if>
+        <if test="exportOrg.startTime != null and exportOrg.endTime != null">
+            AND org.gmt_create BETWEEN #{exportOrg.startTime} and #{exportOrg.endTime}
+        </if>
+        ORDER BY org.gmt_create DESC 
+	</select>
 </mapper>