diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
index c158e828b..523965e1f 100644
--- a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
+++ b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
@@ -2,6 +2,7 @@ package com.zhgd.xmgl.async;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -28,7 +29,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -320,14 +320,14 @@ public class AsyncHikvision {
                 String sucSbStr = sucSb.toString();
                 if (StringUtils.isNotBlank(sucSbStr)) {
                     sucSbStr = "下发权限成功：" + sucSbStr;
-                    msg += sucSbStr + "，";
+                    msg += sucSbStr + " ";
                 }
                 String failSbStr = failSb.toString();
                 if (StringUtils.isNotBlank(failSbStr)) {
                     failSbStr = "下发权限失败：" + failSbStr;
-                    msg += failSbStr + "，";
+                    msg += failSbStr + " ";
                 }
-                noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, type);
+                noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), StringUtils.substring(msg, 0, msg.length() - 1), title, type);
             }
         } catch (Exception e) {
             log.error("海康：", e);
diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
index fd111295d..f00b48ea2 100644
--- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
+++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
@@ -1946,7 +1946,7 @@ public class HikvisionCall {
         JSONObject jo = HikvisionUtil.getJSONObjectData(rs);
         JSONArray listJa = jo.getJSONArray("list");
         if (CollUtil.isEmpty(listJa)) {
-            failSb.append(workerInfo.getWorkerName() + "，" + dev.getDevName() + "，失败信息：isc不存在该设备,");
+            failSb.append(workerInfo.getWorkerName() + "，" + dev.getDevName() + "，失败信息：isc不存在该设备；");
             return;
         }
         String channelNo = listJa.getJSONObject(0).getString("channelNo");
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java
index 717b0209b..8c8648b14 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java
@@ -103,8 +103,11 @@ public class LoginController {
         return Result.success(resultMap);
     }
 
-    @PostMapping("/getLoginInfoByToken")
     @ApiOperation(value = "根据token获取用户登录信息", notes = "根据token获取用户登录信息", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "headquartersSn", required = false, value = "总公司sn", paramType = "body"),
+    })
+    @PostMapping("/getLoginInfoByToken")
     public Result getLoginInfoByToken(@RequestBody LoginInfoByTokenDto dto) {
         return systemUserService.loginByToken(dto);
     }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java
index db2f125dd..b717450fd 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java
@@ -128,7 +128,9 @@ public class SystemUser implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date pwUpdateTime;
-
+    /**
+     * 无关
+     */
     @ApiModelProperty(value = "新用户和供应商的总公司sn")
     private String headquartersSn;
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/dto/LoginInfoByTokenDto.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/dto/LoginInfoByTokenDto.java
index 681f948c7..4ae687838 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/dto/LoginInfoByTokenDto.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/dto/LoginInfoByTokenDto.java
@@ -7,4 +7,5 @@ import lombok.Data;
 public class LoginInfoByTokenDto {
     @ApiModelProperty("登录的token")
     private String token;
+    private String headquartersSn;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/CompanyConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/CompanyConfigMapper.java
index e6e8b619f..afecf53e1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/CompanyConfigMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/CompanyConfigMapper.java
@@ -19,5 +19,7 @@ public interface CompanyConfigMapper extends BaseMapper<CompanyConfig> {
 
     CompanyConfig getCompanyConfigByProject(String sn);
 
+    CompanyConfig getCompanyConfigByHeadquartersSn(String headquartersSn);
+
     CompanyConfig selectConfigByProject(@Param("projectSn") String projectSn);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyConfigMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyConfigMapper.xml
index f77eb7d7e..1ad3e03ed 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyConfigMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyConfigMapper.xml
@@ -18,21 +18,33 @@
     <select id="getCompanyConfigByProject" resultMap="companyConfigMap">
         SELECT c.*, b.headquarters_sn, d.company_name, b.propagate_file
         FROM project a
-                 INNER JOIN company b ON a.company_sn = b.company_sn
-                 INNER JOIN company_config c ON b.headquarters_sn = c.company_sn
-                 LEFT JOIN company d ON b.headquarters_sn = d.company_sn
+        INNER JOIN company b ON a.company_sn = b.company_sn
+        INNER JOIN company_config c ON b.headquarters_sn = c.company_sn
+        LEFT JOIN company d ON b.headquarters_sn = d.company_sn
         WHERE a.project_sn = #{sn}
     </select>
+    <select id="getCompanyConfigByHeadquartersSn" resultMap="companyConfigMap">
+        SELECT
+        c.*,
+        b.headquarters_sn,
+        d.company_name,
+        b.propagate_file
+        FROM
+        company b
+        INNER JOIN company_config c ON b.headquarters_sn = c.company_sn
+        LEFT JOIN company d ON b.headquarters_sn = d.company_sn
+        WHERE b.company_sn = #{headquartersSn}
+    </select>
     <select id="selectConfigByProject" resultMap="companyConfigMap">
         select c.style_type,
-               c.customer_service_phone,
-               c.company_big_screen,
-               c.project_kanban,
-               c.input_qr_code,
-               c.mobile_attendance,
-               c.module_show_type,
-               c.project_num,
-               c.expire_time,
+        c.customer_service_phone,
+        c.company_big_screen,
+        c.project_kanban,
+        c.input_qr_code,
+        c.mobile_attendance,
+        c.module_show_type,
+        c.project_num,
+        c.expire_time,
                c.is_enable,
                c.company_sn
         FROM project a
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java
index 391734d45..f4de7ed84 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java
@@ -18,7 +18,6 @@ import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
 import com.zhgd.xmgl.modules.basicdata.service.IBaseAuthorityService;
 import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService;
 import org.apache.commons.collections.MapUtils;
-import org.mortbay.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -134,7 +133,7 @@ public class BaseModuleServiceImpl extends ServiceImpl<BaseModuleMapper, BaseMod
         if (companyConfig == null) {
             throw new OpenAlertException("企业配置不存在");
         }
-        if (Objects.equals(systemUser.getAccountType(), 10)) {
+        if (Objects.equals(systemUser.getAccountType(), 10) || Objects.equals(systemUser.getAccountType(), 11)) {
             return systemUserService.getUserAuthority(null, 5, projectSn, companyConfig.getHeadquartersSn(), companyConfig.getStyleType(), moduleType);
         } else if (Objects.equals(systemUser.getAccountType(), 5) || Objects.equals(systemUser.getAccountType(), 6)) {
             return systemUserService.getUserAuthority(Long.valueOf(userId), systemUser.getAccountType(), projectSn, companyConfig.getHeadquartersSn(), companyConfig.getStyleType(), moduleType);
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
index 806322d25..1a777fd7b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
@@ -805,12 +805,12 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         if (systemUser == null) {
             throw new OpenAlertException("未找到对应实体");
         }
-        if (Objects.equals(systemUser.getAccountType(), 10)) {
+        if (Objects.equals(systemUser.getAccountType(), 10) || Objects.equals(systemUser.getAccountType(), 11)) {
             return baseMapper.getMyHeadquarterCompanyList(paramMap);
         } else if (Objects.equals(systemUser.getAccountType(), 5) || Objects.equals(systemUser.getAccountType(), 6)) {
             return companyMapper.getMyHeadquarterCompanyListForProject(paramMap);
         } else {
-            throw new OpenAlertException("只有新用户和项目账号和项目子账号有效");
+            throw new OpenAlertException("只有新用户和供应商和项目账号和项目子账号有效");
         }
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index b64de8b5e..7ca6f62b0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -243,121 +243,244 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
                 }
             }
         }
+
         Map<String, Object> result = new HashMap<>();
-        CompanyConfig companyConfig = null;
-        if (systemUser.getAccountType() == 1) {
-            companyConfig = new CompanyConfig();
-            companyConfig.setIsEnable(1);
-            companyConfig.setEffectiveTime(60 * 60 * 24);
-            companyConfig.setDiffDay(20);
-            companyConfig.setModuleShowType(0);
-            companyConfig.setMobileAttendance(0);
-            companyConfig.setProjectKanban(0);
-            companyConfig.setCompanyBigScreen(0);
-            companyConfig.setInputQrCode(0);
-            companyConfig.setStyleType(1);
-            companyConfig.setEnterProjectBackType(0);
-            companyConfig.setExpireTime(DateUtil.format(DateUtil.tomorrow(), DatePattern.NORM_DATE_PATTERN));
-            companyConfig.setAddProjectType(0);
-            companyConfig.setStyleType(1);
-            companyConfig.setHeadquartersSn("-1");
-        } else if (systemUser.getAccountType() == 5 || systemUser.getAccountType() == 6) {
-            companyConfig = companyConfigMapper.getCompanyConfigByProject(systemUser.getSn());
-        } else if (Objects.equals(systemUser.getAccountType(), 10) || Objects.equals(systemUser.getAccountType(), 11)) {
-            //租户或供应商
-            companyConfig = companyConfigMapper.getCompanyConfigBySN(systemUser.getHeadquartersSn());
-        } else {
-            companyConfig = companyConfigMapper.getCompanyConfigBySN(systemUser.getSn());
-        }
-        log.info("companyConfig：{}", JSON.toJSONString(companyConfig));
-        if (companyConfig.getExpireTime() == null) {
-            throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
-        } else {
-            DateTime expireTime = DateUtil.parse(companyConfig.getExpireTime(), "yyyy-MM-dd");
-            DateTime currentDate = new DateTime();
 
-            if (expireTime.getTime() < currentDate.getTime()) {
-                throw new OpenAlertException(MessageUtil.get("loginExpiredErr"));
-            } else {
-                companyConfig.setDiffDay((int) DateUtil.between(currentDate, DateUtil.offset(expireTime, DateField.DAY_OF_MONTH, 1), DateUnit.DAY));
-            }
-        }
-
-
-        if (companyConfig == null || companyConfig.getIsEnable() == 0) {
-            throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
-        }
-        if (companyConfig.getDiffDay() == 0) {
-            throw new OpenAlertException(MessageUtil.get("loginExpiredErr"));
-        }
-        if (companyConfig.getEffectiveTime() == null) {
-            companyConfig.setEffectiveTime(60 * 60 * 24 * 30 * 12);
-        }
-        SystemLogoConfig slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, companyConfig.getHeadquartersSn()));
-        if (slc == null) {
-            slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, "-1"));
-        }
-        String token = jwtTokenProvider.createToken(MapUtils.getString(map, "account"), companyConfig.getEffectiveTime(), slc != null ? slc.getLoginTimeOut() : null);
-        UserEnterprise userEnterprise = userEnterpriseService.selectUserEnterpriseByUserId(systemUser.getUserId());
-        if (userEnterprise != null) {
-            result.put("userEnterpriseId", userEnterprise.getEnterpriseId());
-        } else {
+        if ((Objects.equals(systemUser.getAccountType(), 10) || Objects.equals(systemUser.getAccountType(), 11)) &&
+                StringUtils.isBlank(MapUtils.getString(map, "headquartersSn"))) {
+            //新用户和供应商
+            //CompanyConfig companyConfig = null;
+            //if (systemUser.getAccountType() == 1) {
+            //    companyConfig = new CompanyConfig();
+            //    companyConfig.setIsEnable(1);
+            //    companyConfig.setEffectiveTime(60 * 60 * 24);
+            //    companyConfig.setDiffDay(20);
+            //    companyConfig.setModuleShowType(0);
+            //    companyConfig.setMobileAttendance(0);
+            //    companyConfig.setProjectKanban(0);
+            //    companyConfig.setCompanyBigScreen(0);
+            //    companyConfig.setInputQrCode(0);
+            //    companyConfig.setStyleType(1);
+            //    companyConfig.setEnterProjectBackType(0);
+            //    companyConfig.setExpireTime(DateUtil.format(DateUtil.tomorrow(), DatePattern.NORM_DATE_PATTERN));
+            //    companyConfig.setAddProjectType(0);
+            //    companyConfig.setStyleType(1);
+            //    companyConfig.setHeadquartersSn("-1");
+            //} else if (systemUser.getAccountType() == 5 || systemUser.getAccountType() == 6) {
+            //    companyConfig = companyConfigMapper.getCompanyConfigByProject(systemUser.getSn());
+            //} else if (systemUser.getAccountType() == 10 || systemUser.getAccountType() == 11) {
+            //
+            //    companyConfig = companyConfigMapper.getCompanyConfigByProject(systemUser.getSn());
+            //} else {
+            //    companyConfig = companyConfigMapper.getCompanyConfigBySN(systemUser.getSn());
+            //}
+            //log.info("companyConfig：{}", JSON.toJSONString(companyConfig));
+            //if (companyConfig.getExpireTime() == null) {
+            //    throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
+            //} else {
+            //    DateTime expireTime = DateUtil.parse(companyConfig.getExpireTime(), "yyyy-MM-dd");
+            //    DateTime currentDate = new DateTime();
+            //
+            //    if (expireTime.getTime() < currentDate.getTime()) {
+            //        throw new OpenAlertException(MessageUtil.get("loginExpiredErr"));
+            //    } else {
+            //        companyConfig.setDiffDay((int) DateUtil.between(currentDate, DateUtil.offset(expireTime, DateField.DAY_OF_MONTH, 1), DateUnit.DAY));
+            //    }
+            //}
+            //
+            //
+            //if (companyConfig == null || companyConfig.getIsEnable() == 0) {
+            //    throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
+            //}
+            //if (companyConfig.getDiffDay() == 0) {
+            //    throw new OpenAlertException(MessageUtil.get("loginExpiredErr"));
+            //}
+            //if (companyConfig.getEffectiveTime() == null) {
+            //    companyConfig.setEffectiveTime(60 * 60 * 24 * 30 * 12);
+            //}
+            //SystemLogoConfig slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, companyConfig.getHeadquartersSn()));
+            //if (slc == null) {
+            //    slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, "-1"));
+            //}
+            String token = jwtTokenProvider.createToken(MapUtils.getString(map, "account"), 60 * 60 * 24 * 30 * 12, 0);
+            //UserEnterprise userEnterprise = userEnterpriseService.selectUserEnterpriseByUserId(systemUser.getUserId());
+            //if (userEnterprise != null) {
+            //    result.put("userEnterpriseId", userEnterprise.getEnterpriseId());
+            //} else {
             result.put("userEnterpriseId", "");
-        }
-        if (systemUser.getAccountType() == 6) {
-            //项目子账号要判断是否能查看设备中台
-            BaseRole baseRole = baseRoleMapper.selectRoleByUserId(systemUser.getUserId());
-            if (baseRole == null) {
-                result.put("seeEquipment", 1);
-            } else {
-                result.put("seeEquipment", Integer.valueOf(baseRole.getSeeEquipment()));
-            }
-        } else {
+            //}
+            //if (systemUser.getAccountType() == 6) {
+            //    //项目子账号要判断是否能查看设备中台
+            //    BaseRole baseRole = baseRoleMapper.selectRoleByUserId(systemUser.getUserId());
+            //    if (baseRole == null) {
+            //        result.put("seeEquipment", 1);
+            //    } else {
+            //        result.put("seeEquipment", Integer.valueOf(baseRole.getSeeEquipment()));
+            //    }
+            //} else {
             result.put("seeEquipment", 0);
-        }
-        result.put("token", token);
-        if (systemUser != null && systemUser.getUserId() != null) {
-            result.put("userId", systemUser.getUserId().toString());
-        } else {
-            result.put("userId", "");
-        }
-        result.put("account", systemUser.getAccount());
-        result.put("userTel", systemUser.getUserTel());
-        result.put("realName", systemUser.getRealName());
-        if (systemUser != null && systemUser.getWorkerId() != null) {
-            result.put("workerId", systemUser.getWorkerId().toString());
-        } else {
-            result.put("workerId", "");
-        }
-        result.put("sn", systemUser.getSn());
-        result.put("styleType", companyConfig.getStyleType());
-        result.put("accountType", systemUser.getAccountType());
-        result.put("headquartersSn", companyConfig.getHeadquartersSn());
-        result.put("companyName", companyConfig.getCompanyName());
-        result.put("propagateFile", companyConfig.getPropagateFile());
-        result.put("moduleShowType", companyConfig.getModuleShowType());
-        result.put("mobileAttendance", companyConfig.getMobileAttendance());
-        result.put("customerServicePhone", companyConfig.getCustomerServicePhone());
-        result.put("inputQrCode", companyConfig.getInputQrCode());
-        result.put("projectKanban", companyConfig.getProjectKanban());
-        result.put("addProjectType", companyConfig.getAddProjectType());
-        result.put("enterProjectBackType", companyConfig.getEnterProjectBackType());
-        result.put("companyBigScreen", companyConfig.getCompanyBigScreen());
-        Map<String, Object> menuAuthority = getUserAuthority(systemUser.getUserId(), systemUser.getAccountType(), systemUser.getSn(), companyConfig.getHeadquartersSn(), companyConfig.getStyleType());
-        result.put("menuAuthority", menuAuthority);
-        result.put("scope", scope);
-        result.put("expire", false);
-        result.put("systemLogoConfig", slc);
-        if (Objects.equals(systemUser.getAccountType(), 10)) {
-            XzSystemUserToCompanyProject xzSystemUserToCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper<XzSystemUserToCompanyProject>()
-                    .eq(XzSystemUserToCompanyProject::getType, 2)
-                    .last("limit 1")
-            );
-            if (xzSystemUserToCompanyProject != null) {
-                result.put("sn", xzSystemUserToCompanyProject.getSn());
+            //}
+            result.put("token", token);
+            if (systemUser != null && systemUser.getUserId() != null) {
+                result.put("userId", systemUser.getUserId().toString());
+            } else {
+                result.put("userId", "");
             }
+            result.put("account", systemUser.getAccount());
+            result.put("userTel", systemUser.getUserTel());
+            result.put("realName", systemUser.getRealName());
+            if (systemUser != null && systemUser.getWorkerId() != null) {
+                result.put("workerId", systemUser.getWorkerId().toString());
+            } else {
+                result.put("workerId", "");
+            }
+            result.put("sn", systemUser.getSn());
+            result.put("styleType", null);
+            result.put("accountType", systemUser.getAccountType());
+            result.put("headquartersSn", null);
+            result.put("companyName", null);
+            result.put("propagateFile", null);
+            result.put("moduleShowType", null);
+            result.put("mobileAttendance", null);
+            result.put("customerServicePhone", null);
+            result.put("inputQrCode", null);
+            result.put("projectKanban", null);
+            result.put("addProjectType", null);
+            result.put("enterProjectBackType", null);
+            result.put("companyBigScreen", null);
+            //Map<String, Object> menuAuthority = getUserAuthority(systemUser.getUserId(), systemUser.getAccountType(), systemUser.getSn(), companyConfig.getHeadquartersSn(), companyConfig.getStyleType());
+            Map<String, Object> menuAuthority = new HashMap<>();
+            menuAuthority.put("moduleList", new ArrayList<>());
+            menuAuthority.put("menuList", new ArrayList<>());
+            result.put("menuAuthority", menuAuthority);
+            result.put("scope", scope);
+            result.put("expire", false);
+            result.put("systemLogoConfig", new SystemLogoConfig());
+            if (Objects.equals(systemUser.getAccountType(), 10)) {
+                XzSystemUserToCompanyProject xzSystemUserToCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper<XzSystemUserToCompanyProject>()
+                        .eq(XzSystemUserToCompanyProject::getType, 2)
+                        .last("limit 1")
+                );
+                if (xzSystemUserToCompanyProject != null) {
+                    result.put("sn", xzSystemUserToCompanyProject.getSn());
+                }
+            }
+            return result;
+        } else {
+            CompanyConfig companyConfig = null;
+            if (systemUser.getAccountType() == 1) {
+                companyConfig = new CompanyConfig();
+                companyConfig.setIsEnable(1);
+                companyConfig.setEffectiveTime(60 * 60 * 24);
+                companyConfig.setDiffDay(20);
+                companyConfig.setModuleShowType(0);
+                companyConfig.setMobileAttendance(0);
+                companyConfig.setProjectKanban(0);
+                companyConfig.setCompanyBigScreen(0);
+                companyConfig.setInputQrCode(0);
+                companyConfig.setStyleType(1);
+                companyConfig.setEnterProjectBackType(0);
+                companyConfig.setExpireTime(DateUtil.format(DateUtil.tomorrow(), DatePattern.NORM_DATE_PATTERN));
+                companyConfig.setAddProjectType(0);
+                companyConfig.setStyleType(1);
+                companyConfig.setHeadquartersSn("-1");
+            } else if (systemUser.getAccountType() == 5 || systemUser.getAccountType() == 6) {
+                companyConfig = companyConfigMapper.getCompanyConfigByProject(systemUser.getSn());
+            } else if (systemUser.getAccountType() == 10 || systemUser.getAccountType() == 11) {
+                companyConfig = companyConfigMapper.getCompanyConfigByHeadquartersSn(MapUtils.getString(map, "headquartersSn"));
+            } else {
+                companyConfig = companyConfigMapper.getCompanyConfigBySN(systemUser.getSn());
+            }
+            log.info("companyConfig：{}", JSON.toJSONString(companyConfig));
+            if (companyConfig.getExpireTime() == null) {
+                throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
+            } else {
+                DateTime expireTime = DateUtil.parse(companyConfig.getExpireTime(), "yyyy-MM-dd");
+                DateTime currentDate = new DateTime();
+
+                if (expireTime.getTime() < currentDate.getTime()) {
+                    throw new OpenAlertException(MessageUtil.get("loginExpiredErr"));
+                } else {
+                    companyConfig.setDiffDay((int) DateUtil.between(currentDate, DateUtil.offset(expireTime, DateField.DAY_OF_MONTH, 1), DateUnit.DAY));
+                }
+            }
+
+
+            if (companyConfig == null || companyConfig.getIsEnable() == 0) {
+                throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
+            }
+            if (companyConfig.getDiffDay() == 0) {
+                throw new OpenAlertException(MessageUtil.get("loginExpiredErr"));
+            }
+            if (companyConfig.getEffectiveTime() == null) {
+                companyConfig.setEffectiveTime(60 * 60 * 24 * 30 * 12);
+            }
+            SystemLogoConfig slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, companyConfig.getHeadquartersSn()));
+            if (slc == null) {
+                slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, "-1"));
+            }
+            String token = jwtTokenProvider.createToken(MapUtils.getString(map, "account"), companyConfig.getEffectiveTime(), slc != null ? slc.getLoginTimeOut() : null);
+            UserEnterprise userEnterprise = userEnterpriseService.selectUserEnterpriseByUserId(systemUser.getUserId());
+            if (userEnterprise != null) {
+                result.put("userEnterpriseId", userEnterprise.getEnterpriseId());
+            } else {
+                result.put("userEnterpriseId", "");
+            }
+            if (systemUser.getAccountType() == 6) {
+                //项目子账号要判断是否能查看设备中台
+                BaseRole baseRole = baseRoleMapper.selectRoleByUserId(systemUser.getUserId());
+                if (baseRole == null) {
+                    result.put("seeEquipment", 1);
+                } else {
+                    result.put("seeEquipment", Integer.valueOf(baseRole.getSeeEquipment()));
+                }
+            } else {
+                result.put("seeEquipment", 0);
+            }
+            result.put("token", token);
+            if (systemUser != null && systemUser.getUserId() != null) {
+                result.put("userId", systemUser.getUserId().toString());
+            } else {
+                result.put("userId", "");
+            }
+            result.put("account", systemUser.getAccount());
+            result.put("userTel", systemUser.getUserTel());
+            result.put("realName", systemUser.getRealName());
+            if (systemUser != null && systemUser.getWorkerId() != null) {
+                result.put("workerId", systemUser.getWorkerId().toString());
+            } else {
+                result.put("workerId", "");
+            }
+            result.put("sn", systemUser.getSn());
+            result.put("styleType", companyConfig.getStyleType());
+            result.put("accountType", systemUser.getAccountType());
+            result.put("headquartersSn", companyConfig.getHeadquartersSn());
+            result.put("companyName", companyConfig.getCompanyName());
+            result.put("propagateFile", companyConfig.getPropagateFile());
+            result.put("moduleShowType", companyConfig.getModuleShowType());
+            result.put("mobileAttendance", companyConfig.getMobileAttendance());
+            result.put("customerServicePhone", companyConfig.getCustomerServicePhone());
+            result.put("inputQrCode", companyConfig.getInputQrCode());
+            result.put("projectKanban", companyConfig.getProjectKanban());
+            result.put("addProjectType", companyConfig.getAddProjectType());
+            result.put("enterProjectBackType", companyConfig.getEnterProjectBackType());
+            result.put("companyBigScreen", companyConfig.getCompanyBigScreen());
+            Map<String, Object> menuAuthority = getUserAuthority(systemUser.getUserId(), systemUser.getAccountType(), systemUser.getSn(), companyConfig.getHeadquartersSn(), companyConfig.getStyleType());
+            result.put("menuAuthority", menuAuthority);
+            result.put("scope", scope);
+            result.put("expire", false);
+            result.put("systemLogoConfig", slc);
+            if (Objects.equals(systemUser.getAccountType(), 10)) {
+                XzSystemUserToCompanyProject xzSystemUserToCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper<XzSystemUserToCompanyProject>()
+                        .eq(XzSystemUserToCompanyProject::getType, 2)
+                        .last("limit 1")
+                );
+                if (xzSystemUserToCompanyProject != null) {
+                    result.put("sn", xzSystemUserToCompanyProject.getSn());
+                }
+            }
+            return result;
         }
-        return result;
     }
 
 
@@ -1024,6 +1147,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         SystemUser systemUser = systemUserMapper.selectOne(queryWrapper);
         HashMap<String, Object> map = new HashMap<>();
         map.put("account", username);
+        map.put("headquartersSn", dto.getHeadquartersSn());
         Map<String, Object> rsMap = doLogin(map, systemUser);
         return Result.success(rsMap);
     }
@@ -1294,6 +1418,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
     public Map<String, Object> deviceLogin(Map<String, Object> map) {
         Integer type = MapUtils.getInteger(map, "type");
         String idCard = MapUtils.getString(map, "idCard");
+        String name = MapUtils.getString(map, "name");
         String carNumber = MapUtils.getString(map, "carNumber");
         Map<String, Object> result = new HashMap<>();
         if (Objects.equals(type, 1)) {
@@ -1301,6 +1426,11 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
             if (CollUtil.isEmpty(devs)) {
                 throw new OpenAlertException("该人员的安全帽设备不存在");
             }
+            for (SafetyHatDev dev : devs) {
+                if (!dev.getWorkerName().equals(name)) {
+                    throw new OpenAlertException("人员姓名错误");
+                }
+            }
             result.put("devInfoList", devs);
         } else if (Objects.equals(type, 2)) {
             MechanicalEquipmentPositionDev dev = mechanicalEquipmentPositionDevMapper.selectOne(new LambdaQueryWrapper<MechanicalEquipmentPositionDev>()
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
index f92f7c874..a7fa5a7e7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
@@ -73,8 +73,18 @@
         (case
         when ex.contract_period_end_time >= DATE_FORMAT(now(), "%Y-%m-%d") then 1
         else 2 end) contract_period_type,
-        round(IFNULL(TRUNCATE(DATEDIFF(ex.contract_period_start_time, DATE_FORMAT(now(), "%Y-%m-%d")) /
-        DATEDIFF(ex.contract_period_start_time, ex.contract_period_end_time), 4), 0) * 100,
+        round(
+        IFNULL(
+        IF
+        (
+        DATEDIFF(
+        DATE_FORMAT( now(), "%Y-%m-%d" ),ex.contract_period_start_time)>= DATEDIFF( ex.contract_period_end_time
+        ,ex.contract_period_start_time),
+        1,
+        TRUNCATE ( DATEDIFF( DATE_FORMAT( now(), "%Y-%m-%d" ),ex.contract_period_start_time) / DATEDIFF(
+        ex.contract_period_end_time ,ex.contract_period_start_time), 4 )),
+        0
+        ) * 100,
         2) period_ratio
         FROM project a
         INNER JOIN company b ON a.company_sn = b.company_sn
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRegistryController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRegistryController.java
index a97cd6004..7c1ae5c10 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRegistryController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRegistryController.java
@@ -161,6 +161,7 @@ public class XzRegistryController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "星纵-用户和供应商注册ID", paramType = "body", required = true, dataType = "String"),
             @ApiImplicitParam(name = "approvalProcess", value = "审核进程2审批通过3拒绝申请", paramType = "body", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "headquartersSn", value = "总企业sn", paramType = "body", required = true, dataType = "Integer"),
     })
     @PostMapping(value = "/approval")
     public Result<XzRegistry> approval(@RequestBody XzRegistry xzRegistry) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java
index e2f4ea1ae..db67ea90a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java
@@ -183,7 +183,7 @@ public class XzRegistryServiceImpl extends ServiceImpl<XzRegistryMapper, XzRegis
                 systemUser.setPassword(xz.getPw());
                 systemUser.setRealName(xz.getAccount());
                 systemUser.setAccountType(10);
-                systemUser.setHeadquartersSn(xz.getHeadquartersSn());//无关
+                systemUser.setHeadquartersSn(null);//无关
                 Long userId = null;
                 try {
                     userId = systemUserService.saveSystemUser(systemUser);
@@ -196,6 +196,7 @@ public class XzRegistryServiceImpl extends ServiceImpl<XzRegistryMapper, XzRegis
                 map.put("userId", userId);
                 map.put("projectSns", projectSns);
                 map.put("companySns", companySns);
+                map.put("headquartersSn", r.getHeadquartersSn());
                 companyService.updateTenantOrg(map);
                 emailUtils.sendSimpleMail(email, xz.getAccount() + "账号审批通过", "您在平台申请的账号已经审核通过，账号：" + xz.getAccount() + "密码：" + xz.getPw());
             } else if (Objects.equals(approvalProcess, 3)) {