修复 bug 4175

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

@@ -82,5 +82,16 @@ public interface TpBuildingOwnerInfoMapper {
      */
     @ResultType(Integer.class)
     @Update("update tp_building_owner_info set owner_tel = #{newPhone} where owner_tel = #{oldPhone}")
-    Integer updateAllByPhone(String oldPhone, String newPhone);
+    Integer updateAllByPhone(@Param("oldPhone") String oldPhone, @Param("newPhone") String newPhone);
+
+    /**
+     * 根据手机号更新 性别 和 姓名
+     * @param phone
+     * @param gender
+     * @param userName
+     * @return
+     */
+    @ResultType(Integer.class)
+    @Update("update tp_building_owner_info set owner_name = #{userName}, gender = #{gender} where owner_tel = #{phone}")
+    int updateGenderAndOwnerNameByPhone(@Param("phone") String phone, @Param("gender") String gender, @Param("userName") String userName);
 }

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

@@ -413,26 +413,12 @@ public class TaUserServiceImpl implements ITaUserService {
         // 数据库数据
         TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
 
-        /**
-         * 判断是否 是业主，如果业主就连着 楼栋资料库 信息修改
-         */
-
-        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
-        TaSysRole sysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
-
         BeanTools.copyProperties(user, taUser);
         int result = taUserMapper.updateByPrimaryKeySelective(taUser);
-        // int VerifyStatus= Integer.parseInt(taUser.getVerifyStatus());
-        if (1 == sysRole.getId()) {
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
-            tpBuildingOwnerInfo.setOwnerName(user.getUserName());
-            tpBuildingOwnerInfo.setGender(user.getGender());
-            tpBuildingOwnerInfo.setOwnerTel(user.getLoginName());
-            tpBuildingOwnerInfo.setUpdateDate(new Date());
-            tpBuildingOwnerInfo.setUpdateUser(taUser.getId());
-            tpBuildingOwnerInfo.setId(userElement.getRoomNoId());
-            tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(tpBuildingOwnerInfo);
-        }
+
+        // 修改楼栋资料库手机号
+        result = tpBuildingOwnerInfoMapper.updateGenderAndOwnerNameByPhone(taUser.getLoginName(), user.getGender(), user.getUserName());
+
         if (result > 0) {
             response.addSuccess("修改成功!");
         } else {

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

@@ -285,7 +285,7 @@
       <if test="faceStatus != null" >
         face_status = #{faceStatus,jdbcType=CHAR},
       </if>
-      <if test="idCard != null">
+      <if test="idCard != null and idCard != ''">
         id_card = #{idCard,jdbcType=VARCHAR},
       </if>
       <if test="openid != null" >