Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.*;
     @Autowired
     private ITaOrgService taOrgService;
 
+    @Autowired
+    private ISysTokenService sysTokenService;
+
+
+
 
 
     /**
             personQueryWrapper.eq("org_id",orgId);
             int count = taPersonService.count(personQueryWrapper);
 
-            if(from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
+            if(null!=from&&from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
                 // 添加积分
                  applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
             }
             result.put("extraInfo", extraInfo);
             result.put("miniAuthorized", null != taPerson.getAvatarurl() && taPerson.getAvatarurl().indexOf("wx.qlogo.cn") > 0);
 
+            String token = miniResp.get("token");
+            sysTokenService.saveToken(token);
 
             return ResponseBean.success(result);
         } catch (WxErrorException e) {

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

             person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
             person.setUserId(user.getUserId());
             person.setAvatarurl(user.getAvatar());
+            person.setCompany(user.getOrgName());
+            person.setTel(user.getPhone());
+            person.setName(user.getUserName());
+            person.setAddress(user.getAddress());
+            person.setIdNo(user.getIdNo());
+            person.setDepartment(user.getDepartment());
+            person.setPost(user.getPosition());
+            person.setPhoto(user.getPhoto());
             taPersonService.updateById(person);
             responseBean.addSuccess(person);
         }else {