编辑用户信息限制管理员数量

src/main/java/cn/chnmuseum/party/model/TVideoVisitor.java

@@ -41,6 +41,10 @@ public class TVideoVisitor implements Serializable {
     @TableField("area")
     private String area;
 
+    @ApiModelProperty(value = "area", name = "地区编码")
+    @TableField("area_code")
+    private String areaCode;
+
     @ApiModelProperty(value = "createTime", name = "创建时间")
     @TableField("create_time")
     private Date createTime;

src/main/java/cn/chnmuseum/party/web/controller/StatisticController.java

@@ -86,11 +86,14 @@ public class StatisticController extends BaseController {
             }
             Map<String, String> addressByIp = AddressUtil.getAddressByIp(ipAddress);
             if (StringUtils.isNotBlank(addressByIp.get("region"))) {
-                tVideoVisitor.setArea(addressByIp.get("regionCode"));
+                tVideoVisitor.setAreaCode(addressByIp.get("regionCode"));
+                tVideoVisitor.setArea(addressByIp.get("region"));
             }else if(StringUtils.isNotBlank(addressByIp.get("city"))){
-                tVideoVisitor.setArea(addressByIp.get("cityCode"));
+                tVideoVisitor.setAreaCode(addressByIp.get("cityCode"));
+                tVideoVisitor.setArea(addressByIp.get("city"));
             }else {
-                tVideoVisitor.setArea(addressByIp.get("proCode"));
+                tVideoVisitor.setAreaCode(addressByIp.get("proCode"));
+                tVideoVisitor.setArea(addressByIp.get("pro"));
             }
 
             // 该条信息的创建时间和更新时间

src/main/java/cn/chnmuseum/party/web/controller/TUserController.java

@@ -416,12 +416,12 @@ public class TUserController extends BaseController {
                     **/
 
                     TUser tUser = userService.getById(user.getId());
-                    if (ROLE_PTGLY.equals(user.getRoleId()) && list.size() >= 2 && !tUser.getOrgId().equals(user.getOrgId())) {
+                    if (ROLE_PTGLY.equals(user.getRoleId()) && list.size() >= 2 ) {
                         resultMap.put("resultCode", "400");
                         resultMap.put("message", "机构已存在两个单位管理员！");
                         return resultMap;
                     }
-                    if (ROLE_HDSHY.equals(user.getRoleId()) && list.size() >= 1 && !tUser.getOrgId().equals(user.getOrgId())) {
+                    if (ROLE_HDSHY.equals(user.getRoleId()) && list.size() >= 1) {
                         resultMap.put("resultCode", "400");
                         resultMap.put("message", "机构已存在一个互动审核员！");
                         return resultMap;