合并

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

      * @param phoneNo 电话
      * @return
      */
-    public static String HKpersonPhone(Integer personId,Integer personNo,String personName,String phoneNo) {
+    public static String HKpersonPhone(Integer personId,Long personNo,String personName,String phoneNo) {
 
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> map = new HashMap<String, Object>();

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

             response.addError("号码已占用");
             return response;
         }
-        String data=HKOpenApi.HKpersonPhone(user.getHkUserId(),user.getId(),user.getUserName(),phone);
-       try {
-             if (null == data) {
-            throw new RuntimeException("海康人脸推送失敗！");
-        }
-       }catch (Exception e){
-           e.printStackTrace();
-           log.error("海康修改电话失敗！ {}",e);
-           throw new RuntimeException("海康修改电话失敗！");
-       }
+        String data=HKOpenApi.HKpersonPhone(user.getHkUserId(),user.getHkPersonNo(),user.getUserName(),phone);
+        JSONObject jsonobject = JSONObject.parseObject(data);
+        int errorCode = jsonobject.getInteger("errorCode");
+        if (errorCode!=0){
+            response.addError("海康电话已存在,推送海康电话修改失败");
+            return response;
+        }
         if(null!=codes && codes.equals(code)){;
             TaUser taUser=new TaUser();
             taUser.setLoginName(phone);

CODE/smart-community/operate-api/src/main/resources/mapper/TpUserMapper.xml

 
   <select id="selectByTel" resultMap="BaseResultMap">
       select <include refid="Base_Column_List" /> from tp_user
-      where community_id = #{id,jdbcType=INTEGER}
-      and login_name = #{loginName,jdbcType=VARCHAR}
+      where login_name = #{loginName,jdbcType=VARCHAR}
       and status = 1
   </select>
 
         login_name = #{loginName,jdbcType=VARCHAR},
       </if>
     </set>
-    where community_id = #{id,jdbcType=INTEGER}
-    and login_name = #{oldTel,jdbcType=VARCHAR}
+    where login_name = #{oldTel,jdbcType=VARCHAR}
     and status = 1
   </update>
 

VUECODE/smart-operate-manage/src/views/community/communityTable.vue

         if (valid) {
           this.CreateCommunity(this.detail).then(res => {
             this.dialogFormVisible = false;
-            if (res.code === 0) {
+            if (res.code === '0') {
               this.$message({
                 message: "创建成功",
                 type: "success"
               });
               this.getList();
-            } else if (res.code === 0) {
+            } else if (res.code === '1') {
               this.$message({
                 message: res.message,
                 type: "warning"
         if (valid) {
           this.UpdateCommunity(this.detail).then(res => {
             this.dialogFormVisible = false;
-            if (res.code === 0) {
+            if (res.code === '0') {
               this.$message({
                 message: "更新成功",
                 type: "success"
               });
               this.getList();
-            } else if (res.code === 0) {
+            } else if (res.code === '1') {
               this.$message.error(res.message);
             }
           });

VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue

       </el-form-item>
     </el-form>
     <el-table ref="multipleTable" :data="list" border tooltip-effect="dark" style="width: 100%; margin-top: 20px;">
-      <el-table-column label="栋">
+      <el-table-column label="栋" align="center">
         <template slot-scope="scope">{{ scope.row.building }}</template>
       </el-table-column>
-      <el-table-column label="单元">
+      <el-table-column label="单元" align="center">
         <template slot-scope="scope">{{ scope.row.unit }}</template>
       </el-table-column>
-      <el-table-column label="楼层">
+      <el-table-column label="楼层" align="center">
         <template slot-scope="scope">{{ scope.row.level }}</template>
       </el-table-column>
-      <el-table-column label="户号">
+      <el-table-column label="户号" align="center">
         <template slot-scope="scope">{{ scope.row.roomNo }}</template>
       </el-table-column>
-      <el-table-column label="业主姓名">
+      <el-table-column label="业主姓名" align="center">
         <template slot-scope="scope">{{ scope.row.ownerName }}</template>
       </el-table-column>
-      <el-table-column label="手机号码">
+      <el-table-column label="手机号码" align="center">
         <template slot-scope="scope">{{ scope.row.ownerTel }}</template>
       </el-table-column>
     </el-table>