注释

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

@@ -781,13 +781,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, "该机构存在");
         }
@@ -810,8 +811,9 @@ public class UserFacade extends UserServiceImpl {
     }
 
     /**
+     * 添加用户信息和机构信息管理员
      * @param userAndOrganizationVO
-     * @return 添加用户信息和机构信息管理员
+     * @return 
      */
     public RespDTO<Boolean> addUserInfos(UserAndOrganizationVO userAndOrganizationVO) {
         // TODO 先查找机构，获取机构id,再注册用户,返回用户id, 取到用户id和 机构id ,查询用户机构关联表，在进行绑定
@@ -1054,7 +1056,7 @@ public class UserFacade extends UserServiceImpl {
 	}
 
 /**
- * 用户信息
+ * 导出用户信息
  * @param userExportVO
  * @param response
  */
@@ -1256,7 +1258,7 @@ public class UserFacade extends UserServiceImpl {
 		
 	}
 
-    //超管修改用户信息
+    //超管修改用户信息接口
 	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,32 +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/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,34 +109,39 @@ 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

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/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
@@ -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>