增加注解,删除单表查询方法

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

@@ -1,14 +1,6 @@
 package com.diagbot.facade;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.diagbot.dto.QueryAuthProgressDTO;
 import com.diagbot.dto.UserAuthenticationDTO;
 import com.diagbot.dto.WaitAuthenDTO;
@@ -22,6 +14,12 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.UserAuthenticationServiceImpl;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.UserAuthenticationVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @Description:用户认证业务层
@@ -61,7 +59,10 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
                     "当前用户没有关联机构，不允许验证");
         }
         //更新机构信息
-        Organization organization = organizationFacade.getByName(userAuthenticationVO.getOrganization());
+        QueryWrapper<Organization> qwOrganization = new QueryWrapper<>();
+        qwOrganization.eq("name", userAuthenticationVO.getOrganization());
+        qwOrganization.eq("is_deleted", "N");
+        Organization organization = organizationFacade.getOne(qwOrganization);
         if (organization == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "找不到机构【" + userAuthenticationVO.getOrganization() + "】");
@@ -78,10 +79,10 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         organizationFacade.updateById(organization);
 
         //更新验证信息
-        QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
-        qw.eq("user_id", userId);
-        qw.eq("is_deleted", "N");
-        UserAuthentication userAuthentication = this.getOne(qw);
+        QueryWrapper<UserAuthentication> qwAuthentication = new QueryWrapper<>();
+        qwAuthentication.eq("user_id", userId);
+        qwAuthentication.eq("is_deleted", "N");
+        UserAuthentication userAuthentication = this.getOne(qwAuthentication);
         if (userAuthentication == null) {
             userAuthentication = new UserAuthentication();
             userAuthentication.setCreator(userId.toString());

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

@@ -22,13 +22,6 @@ public interface OrganizationMapper extends BaseMapper<Organization> {
      */
     public Organization getByUserId(Long userId);
 
-    /**
-     * @Description: 通过机构名称获取组织结构
-     * @Author: zhaops
-     * @Date: 2018/9/13 19:24
-     */
-    public Organization getByName(String name);
-
     /**
      * @Description: 模糊查询机构名称
      * @Author: wangfeng

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

@@ -30,12 +30,6 @@ public interface OrganizationService extends IService<Organization> {
      */
     public Organization getByUserId(Long userId);
 
-    /**
-     * @Description: 通过机构名称获取组织结构
-     * @Author: zhaops
-     * @Date: 2018/9/13 19:24
-     */
-    public Organization getByName(String name);
     
     /**
      * @Description: 模糊查询机构名称

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

@@ -37,14 +37,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
     public Organization getByUserId(Long userId){
         return baseMapper.getByUserId(userId);
     }
-    /**
-     * @Description: 通过机构名称获取组织结构
-     * @Author: zhaops
-     * @Date: 2018/9/13 19:24
-     */
-    public Organization getByName(String name){
-        return baseMapper.getByName(name);
-    }
+
 
     /**
      * @Description: 模糊查询机构名称

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

@@ -24,11 +24,6 @@
         where a.id = b.organization_id and b.user_id = #{userId} and a.is_deleted = 'N' and b.is_deleted = 'N'
     </select>
 
-    <select id="getByName" resultMap="BaseResultMap">
-        SELECT a.* FROM `sys_organization` a
-        where a.name = #{name} and a.is_deleted = 'N'
-    </select>
-
 	<select id="findOrganization" parameterType="java.lang.String" resultType="com.diagbot.entity.Organization" >
 		SELECT id,NAME FROM sys_organization WHERE is_deleted = "N" AND NAME LIKE
 		CONCAT('%',  #{organizationName}, '%')