合并本地分支

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -176,7 +176,7 @@ public class FaceServicelimpl implements FaceServiceI {
      */
     public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserID){
        ResponseBean  responseBean= new ResponseBean();
-        TaUser user = taUserMapper.selectTaFaceParentId(userId,otherUserID);
+         TaUser user = taUserMapper.selectTaFaceParentId(userId,otherUserID);
         if (null == user){
             responseBean.addError("您输入的家属或租户ID有误");
             return responseBean;

CODE/smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml

@@ -313,9 +313,9 @@
     select
     <include refid="Base_Column_List" />
     from ta_user
-    where id = #{otherUserID,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
     <if test="otherUserID != null" >
-     and parent_id = #{id}
+     and parent_id = #{otherUserID}
     </if>
 
   </select>