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

houruijun

2020-08-13 d526d571cbe0a950e777fb325978d72f3ddb302b

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java

@@ -70,13 +70,13 @@
    * @param newPassword
    * @return
    */
   ResultBody updatePassword(Long id, String oldPassword, String newPassword,Boolean isdefault);
   ResultBody updatePassword(Long id, String oldPassword, String newPassword,Boolean isdefault) throws Exception;
   /**
    * 更新手机号
    * @param params
    * @return
    */
   ResultBody updateUserTel(Map<String,Object> params);
   ResultBody updateUserTel(Map<String,Object> params) throws Exception ;
   /**
    * 用户列表
    * @param params
@@ -119,7 +119,7 @@

   ResultBody findCountByMap(Map<String, Object> map);

    ResultBody passwordByPhone(Map<String, Object> map);
    ResultBody passwordByPhone(Map<String, Object> map) throws Exception;

   ResultBody registerByPhone(Map<String, Object> map);

@@ -143,7 +143,7 @@
    * @param userRegVo
    * @return
    */
   ResultBody doctorUserReg(UserRegVo userRegVo,SysUser sysUser);
   ResultBody doctorUserReg(UserRegVo userRegVo,SysUser sysUser) throws Exception;
   /**
    * 获取医院科室下的所有有效的医生
    * @param hospitalId
@@ -157,6 +157,27 @@
    * @return
    */
   ResultBody isRegUser(String userTel);

   /**
    * 检查手机号是否已经注册 true存在  false不存在
    * @param phone
    * @return
    */
   boolean phoneIsUsed(String phone);

   ResultBody jiaMipython(String password);

   /**
    * 根据科室id反查医院id
    * @param departmentId  科室id
    * @return
    */
   Long HospitalIdByDepartmentId(Long departmentId);

   /**
    * 删除用户  不删除关系表 ，role_user 表  和 用户组织
    *
    * @param id
    */
    boolean deleteNoContact(Long id);
}