本地合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -476,6 +476,7 @@ public class HKOpenApi {
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
         parMap.put("personNo",map.get("personNo"));
+        parMap.put("personId",map.get("personId"));
         parMap.put("personName",map.get("personName"));
         parMap.put("phoneNo",map.get("phoneNo"));
         parMap.put("deptUuid",map.get("deptUuid"));

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -63,5 +63,5 @@ public interface TaUserMapper {
      * @param phone
      * @return
      */
-    TaUser getByLoginName(@Param("communityId")Integer communityId, @Param("phone")String phone);
+    TaUser getByLoginName(@Param("id")Integer communityId, @Param("id")String phone);
 }

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

@@ -211,7 +211,7 @@ public class FaceServicelimpl implements FaceServiceI {
         }
         //身份为家属租客，状态为已停用
         if (null!=taUser && null!=sysRole){
-            if (Constant.INVALID.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
+            if (Constant.INVALID.equals(taUser.getStatus()) && ((Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName()))){
                 response.addError("9996", "您的身份已停用，请联系物业");
                 return response;
             }
@@ -232,7 +232,7 @@ public class FaceServicelimpl implements FaceServiceI {
                 return resps;
             }
             //家属或者租客，已认证
-            if (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getDescription()) && "1".equals(taUser.getVerifyStatus())) {
+            if (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
                 ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, userid);
                 if (resps.getCode().equals("0")) {
                     taUser.setFaceStatus("1");

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

@@ -564,6 +564,7 @@ public class TaUserServiceImpl implements ITaUserService {
         // 人员参数
         Map<String,Object> parUser = Maps.newHashMap();
         parUser.put("personNo",user.getId());
+        parUser.put("personId",user.getHkUserId());
         parUser.put("personName",user.getUserName());
         parUser.put("phoneNo",user.getLoginName());
         parUser.put("deptUuid",deptUuid);

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

@@ -311,21 +311,27 @@
 
   <select id="selectTaFaceParentId" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
     select
-    <include refid="Base_Column_List" />
+      <include refid="Base_Column_List" />
     from ta_user
-    where id = #{id,jdbcType=INTEGER}
+    where 1=1
     <if test="otherUserID != null" >
-     and parent_id = #{otherUserID}
+     and id = #{otherUserID,jdbcType=INTEGER}
     </if>
-
+    <if test="id != null" >
+     and parent_id = #{id}
+    </if>
+    limit 1
   </select>
 
-  <select id="getByLoginName" parameterType="com.community.huiju.model.TaUser" resultMap="BaseResultMap" >
+  <select id="getByLoginName" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
     select
     <include refid="Base_Column_List" />
     from ta_user
     where community_id = #{communityId,jdbcType=INTEGER}
-      and login_name = #{phone ,jdbcType=VARCHAR}
+    <if test="otherUserID != null" >
+      and login_name = #{phone}
+    </if>
+
   </select>
 
 </mapper>