diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UpOff.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UpOff.java
index bfeafa5..d62302c 100644
--- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UpOff.java
+++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/UpOff.java
@@ -64,4 +64,8 @@ public class UpOff extends BaseEntity
     @ApiModelProperty(value = "状态（1通过，2驳回）", required = true)
     private String status;
 
+    @Excel(name="驳回备注")
+    @ApiModelProperty(value = "驳回备注", required = true)
+    private String auditRemark;
+
 }
diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/MaDevInfoVo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/MaDevInfoVo.java
index 239f6d6..2aeb239 100644
--- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/MaDevInfoVo.java
+++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/MaDevInfoVo.java
@@ -35,6 +35,16 @@ public class MaDevInfoVo extends DevInfo {
     @ApiModelProperty(value = "设备保险信息图片路径", required = true)
     private String insureImageUrl;
 
+    @ApiModelProperty(value = "设备检验信息图片名称", required = true)
+    private String inspectImageName;
+
+    //设备保险信息图片路径
+    @ApiModelProperty(value = "设备保险信息图片名称", required = true)
+    private String insureImageName;
+
+    @ApiModelProperty(value= "租赁范围")
+    private String dictLeaseScope;
+
 
 
 
diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/enums/leaseScopeEnums.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/enums/leaseScopeEnums.java
new file mode 100644
index 0000000..a6ab484
--- /dev/null
+++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/enums/leaseScopeEnums.java
@@ -0,0 +1,40 @@
+package com.bonus.zlpt.equip.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Getter
+@AllArgsConstructor
+public enum leaseScopeEnums {
+
+    //全平台
+    ALL_SCOPE(329,"全平台"),
+
+    //专区
+    ONLY_SCOPE(330,"专区");
+
+    public static final Map<Integer,String> ID_KEY_MAP = new HashMap<>();
+
+    public static final Map<String,Integer> CODE_KEY_MAP = new HashMap<>();
+
+    static {
+        for (leaseScopeEnums value : values()) {
+            ID_KEY_MAP.put(value.getId(),value.getCode());
+            CODE_KEY_MAP.put(value.getCode(),value.getId());
+        }
+    }
+
+
+
+    private final Integer id;
+
+    private final String code;
+
+
+
+
+}
diff --git a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/RemoteUserService.java b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/RemoteUserService.java
index c9952b8..8c9529b 100644
--- a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/RemoteUserService.java
+++ b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/RemoteUserService.java
@@ -3,6 +3,7 @@ package com.bonus.zlpt.system.api;
 import com.bonus.zlpt.common.core.web.domain.AjaxResult;
 import com.bonus.zlpt.common.core.web.page.TableDataInfo;
 import com.bonus.zlpt.system.api.domain.SysUser;
+import com.bonus.zlpt.system.api.domain.vo.UserVo;
 import com.bonus.zlpt.system.api.factory.RemoteUserFallbackFactory;
 import com.bonus.zlpt.system.api.model.LoginUser;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -86,4 +87,7 @@ public interface RemoteUserService
     AjaxResult remove(@PathVariable("userIds") Long[] userIds);
 
 
+    @GetMapping("/user/selectUserVo")
+    R<UserVo> selectUserVo(@RequestParam("userId") Long userId);
+
 }
diff --git a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java
new file mode 100644
index 0000000..d91d6d5
--- /dev/null
+++ b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java
@@ -0,0 +1,23 @@
+package com.bonus.zlpt.system.api.domain.vo;
+
+import lombok.Data;
+@Data
+public class UserVo {
+
+
+        //用户id
+        private String userId;
+
+        //用户手机号
+        private String phonenumber;
+
+        //企业id
+        private Integer companyId;
+
+        //企业名称
+        private String companyName;
+
+        //企业logo
+        private String logoUrl;
+
+}
diff --git a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/factory/RemoteUserFallbackFactory.java b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/factory/RemoteUserFallbackFactory.java
index 478e9fe..0718f63 100644
--- a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/factory/RemoteUserFallbackFactory.java
+++ b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/factory/RemoteUserFallbackFactory.java
@@ -3,6 +3,7 @@ package com.bonus.zlpt.system.api.factory;
 import com.bonus.zlpt.common.core.web.domain.AjaxResult;
 import com.bonus.zlpt.common.core.web.page.TableDataInfo;
 import com.bonus.zlpt.system.api.domain.SysUser;
+import com.bonus.zlpt.system.api.domain.vo.UserVo;
 import com.bonus.zlpt.system.api.model.LoginUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,6 +65,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
                 return null;
             }
 
+            @Override
+            public R<UserVo> selectUserVo(Long userId) {
+                return null;
+            }
+
 
         };
     }
diff --git a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/model/LoginUser.java b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/model/LoginUser.java
index 8939e98..845aec8 100644
--- a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/model/LoginUser.java
+++ b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/model/LoginUser.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Set;
 
 import com.bonus.zlpt.system.api.domain.SysUser;
+import com.bonus.zlpt.system.api.domain.vo.UserVo;
 
 /**
  * 用户信息
@@ -59,6 +60,16 @@ public class LoginUser implements Serializable
      */
     private SysUser sysUser;
 
+    private UserVo userVo;
+
+    public UserVo getUserVo() {
+        return userVo;
+    }
+
+    public void setUserVo(UserVo userVo) {
+        this.userVo = userVo;
+    }
+
     public String getToken()
     {
         return token;
diff --git a/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java b/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java
index 1ae267d..b188269 100644
--- a/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java
+++ b/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java
@@ -2,6 +2,7 @@ package com.bonus.zlpt.auth.service;
 
 import com.bonus.zlpt.common.core.utils.DateUtils;
 import com.bonus.zlpt.system.api.constants.RedisConstants;
+import com.bonus.zlpt.system.api.domain.vo.UserVo;
 import io.micrometer.core.instrument.util.TimeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -112,6 +113,9 @@ public class SysLoginService
         }
         passwordService.validate(user, password);
         recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
+        Long userId = user.getUserId();
+        R<UserVo> userVoR = remoteUserService.selectUserVo(userId);
+        userInfo.setUserVo(userVoR.getData());
         return userInfo;
     }
 
diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java
index f271749..0244ee5 100644
--- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java
+++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java
@@ -52,7 +52,7 @@ public class BmCompanyInfoController extends BaseController {
     /**
      * 获取公司列表
      */
-    @RequiresPermissions("system:company:list")
+//    @RequiresPermissions("system:company:list")
     @GetMapping("/list")
     @ApiOperation("获取公司列表")
     public AjaxResult list(BmCompanyInfo obj) {
@@ -63,7 +63,7 @@ public class BmCompanyInfoController extends BaseController {
     /**
      * 新增 -- 录入企业信息
      */
-    @RequiresPermissions("system:company:add")
+//    @RequiresPermissions("system:company:add")
     @Log(title = "企业管理", businessType = BusinessType.INSERT)
     @PostMapping("addCompanyInfo")
     @ApiOperation("录入企业信息")
@@ -74,7 +74,7 @@ public class BmCompanyInfoController extends BaseController {
     /**
      * 修改 -- 企业信息变更
      */
-    @RequiresPermissions("system:company:edit")
+//    @RequiresPermissions("system:company:edit")
     @Log(title = "企业管理", businessType = BusinessType.UPDATE)
     @PostMapping("updateCompanyInfo")
     @ApiOperation("企业信息变更")
@@ -92,7 +92,7 @@ public class BmCompanyInfoController extends BaseController {
     /**
      * 删除 -- 企业注销
      */
-    @RequiresPermissions("system:company:remove")
+//    @RequiresPermissions("system:company:remove")
     @Log(title = "企业管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
     @ApiOperation("企业注销")
@@ -127,17 +127,18 @@ public class BmCompanyInfoController extends BaseController {
 
     /**
      * 企业入驻信息导出
-     * @param response
+     * @param
      */
     @GetMapping("/exportExcel")
     @ApiOperation("企业入驻信息导出")
-    public void exportExcel(HttpServletResponse response) throws UnsupportedEncodingException {
+    public void  exportExcel(HttpServletResponse response) throws UnsupportedEncodingException {
 
         ExcelUtil<BmCompanyInfo> bmCompanyInfoExcelUtil = new ExcelUtil<>(BmCompanyInfo.class);
-        bmCompanyInfoExcelUtil.exportExcel(response,bmCompanyInfoService.selectList(new BmCompanyDto()),"企业入驻信息","","企业入驻信息");
+        bmCompanyInfoExcelUtil.exportExcel(response,bmCompanyInfoService.selectList(new BmCompanyDto()), "企业入驻信息", "", "企业入驻信息");
     }
 
 
+
     /**
      * 根据条件查询企业详细信息
      * @return
diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java
index efd25ca..3c6b026 100644
--- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java
+++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java
@@ -11,6 +11,7 @@ import com.bonus.zlpt.company.service.BmCompanyTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -135,7 +136,7 @@ public class BmCompanyTypeController extends BaseController {
 
     /**
      * 企业类型导出
-     * @param response
+     * @param
      */
     @GetMapping("/exportExcel")
     @ApiOperation("企业类型导出")
diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java
index e92bca6..986526c 100644
--- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java
@@ -6,6 +6,8 @@ import com.bonus.zlpt.company.api.domain.dto.BmCompanyDto;
 import com.bonus.zlpt.company.api.domain.dto.BmCompanyInfoDto;
 import com.bonus.zlpt.company.api.domain.vo.BmCompanyInfoVo;
 import com.bonus.zlpt.company.api.domain.vo.BmCompanyVo;
+import com.bonus.zlpt.company.api.enums.CompanyLtdEnum;
+import com.bonus.zlpt.company.api.enums.CompanyTypeEnum;
 import com.bonus.zlpt.company.mapper.BmCoBankMapper;
 import com.bonus.zlpt.company.service.BmCompanyInfoService;
 import com.bonus.zlpt.system.api.RemoteUserService;
@@ -74,8 +76,11 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
     @Transactional
     public int updateByPrimaryKeySelective(BmCompanyInfoDto record) {
 
-        bmCoBankMapper.updateByPrimaryKeySelective(record.getBmCoBank());
-        return bmCompanyInfoMapper.updateByPrimaryKeySelective(record.getBmCompanyInfo());
+        int count = bmCompanyInfoMapper.updateByPrimaryKeySelective(record.getBmCompanyInfo());
+        if(record.getBmCoBank() == null || record.getBmCoBank().getId()==null){
+            return count;
+        }
+        return bmCoBankMapper.updateByPrimaryKeySelective(record.getBmCoBank());
     }
 
     @Override
@@ -90,7 +95,10 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
     public List<BmCompanyInfo> selectList(BmCompanyDto bmCompanyDto) {
 
         List<BmCompanyInfo> bmCompanyInfos = bmCompanyInfoMapper.selectList(bmCompanyDto);
+
         for (BmCompanyInfo bmCompanyInfo : bmCompanyInfos) {
+            bmCompanyInfo.setCompanyType(CompanyTypeEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyType())));
+            bmCompanyInfo.setCompanyLtd(CompanyLtdEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyLtd())));
             SysUser data = remoteUserService.selectUserById(bmCompanyInfo.getCreator().longValue()).getData();
             bmCompanyInfo.setUserName(data.getUserName());
         }
@@ -108,7 +116,8 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
 
         //根据id查询企业详情
         BmCompanyInfo bmCompanyInfo = bmCompanyInfoMapper.selectByPrimaryKey(id);
-
+        bmCompanyInfo.setCompanyType(CompanyTypeEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyType())));
+        bmCompanyInfo.setCompanyLtd(CompanyLtdEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyLtd())));
         BmCompanyVo bmCompanyVo = new BmCompanyVo();
         bmCompanyVo.setBmCompanyInfo(bmCompanyInfo);
 
@@ -128,6 +137,8 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
 
         for (BmCompanyInfo bmCompanyInfo : list) {
 
+            bmCompanyInfo.setCompanyType(CompanyTypeEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyType())));
+            bmCompanyInfo.setCompanyLtd(CompanyLtdEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyLtd())));
             Integer userId = bmCompanyInfo.getCreator();
             //获取当前被授权用户信息
             SysUser sysUser = remoteUserService.selectUserById(userId.longValue()).getData();
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java
index 0bea7a3..fe699c8 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java
@@ -1,5 +1,7 @@
 package com.bonus.zlpt.equip.controller;
 
+import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import com.bonus.zlpt.common.core.utils.poi.ExcelUtil;
@@ -10,20 +12,19 @@ import com.bonus.zlpt.common.log.annotation.Log;
 import com.bonus.zlpt.common.log.enums.BusinessType;
 import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
 
+import com.bonus.zlpt.common.security.utils.SecurityUtils;
+import com.bonus.zlpt.equip.api.domain.DevInfo;
 import com.bonus.zlpt.equip.api.domain.UpOff;
 import com.bonus.zlpt.equip.api.domain.dto.UpOffDto;
 import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo;
 import com.bonus.zlpt.equip.api.domain.vo.MaDevInfoVo;
+import com.bonus.zlpt.equip.mapper.DevInfoMapper;
+import com.bonus.zlpt.equip.service.IDevInfoService;
+import com.bonus.zlpt.system.api.RemoteUserService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 import com.bonus.zlpt.equip.service.IUpOffService;
 
 /**
@@ -41,6 +42,12 @@ public class UpOffController extends BaseController
     @Autowired
     private IUpOffService upOffService;
 
+    @Autowired
+    private IDevInfoService devInfoService;
+
+    @Autowired
+    private RemoteUserService remoteUserService;
+
 
 
 
@@ -75,8 +82,8 @@ public class UpOffController extends BaseController
      * 审批获取详细数据
      * @return
      */
-    @PostMapping("/selectInfo")
-    public AjaxResult selectInfo(@RequestBody List<Long> ids){
+    @GetMapping("/selectInfo")
+    public AjaxResult selectInfo(@RequestParam("ids") List<Long> ids){
 
         return success(upOffService.selectInfo(ids));
     }
@@ -108,7 +115,6 @@ public class UpOffController extends BaseController
 
     /**
      * 新增设备上下架管理
-
      */
  //   @RequiresPermissions("equip:off:add")
     @Log(title = "设备上下架管理", businessType = BusinessType.INSERT)
@@ -122,15 +128,32 @@ public class UpOffController extends BaseController
     }
 
     /**
-     * 修改设备上下架管理
-
+     * 审批接口
      */
     //@RequiresPermissions("equip:off:edit")
     @Log(title = "设备上下架管理", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody UpOff upOff)
+    @PostMapping("/edit")
+    @Transactional
+    public AjaxResult edit(@RequestBody List<UpOff> upOff)
     {
-        return toAjax(upOffService.updateUpOff(upOff));
+        for (UpOff off : upOff) {
+            DevInfo devInfo = new DevInfo();
+            if(off.getStatus().equals("1")){
+                devInfo.setMaStatus("16");
+            }else{
+                devInfo.setMaStatus("332");
+            }
+            Long maId = off.getMaId();
+            devInfo.setMaId(maId);
+            devInfoService.updateDevInfo(devInfo);
+            String userName = remoteUserService.selectUserById(off.getId()).getData().getUserName();
+            off.setAuditUser(SecurityUtils.getUsername());
+            off.setAuditTime(LocalDateTime.now().toString());
+            off.setApplyUser(userName);
+            off.setId(null);
+        }
+        upOffService.insertUpOff(upOff);
+        return success();
     }
 
     /**
@@ -139,8 +162,8 @@ public class UpOffController extends BaseController
      */
  //   @RequiresPermissions("equip:off:remove")
     @Log(title = "设备上下架管理", businessType = BusinessType.DELETE)
-	@PostMapping("/remove")
-    public AjaxResult remove(@RequestBody  Long[] ids)
+	@GetMapping("/remove")
+    public AjaxResult remove(@RequestParam("ids") Long[] ids)
     {
         return toAjax(upOffService.deleteUpOffByIds(ids));
     }
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
index b996ceb..0343a65 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
@@ -10,6 +10,7 @@ import com.bonus.zlpt.equip.api.domain.TypeInfo;
 import com.bonus.zlpt.equip.api.domain.UpOff;
 import com.bonus.zlpt.equip.api.domain.dto.UpOffDto;
 import com.bonus.zlpt.common.core.enums.FileDictEnum;
+import com.bonus.zlpt.equip.api.enums.leaseScopeEnums;
 import com.bonus.zlpt.equip.mapper.SysFileInfoMapper;
 import com.bonus.zlpt.equip.mapper.TypeInfoMapper;
 import com.bonus.zlpt.equip.api.domain.vo.MaDevInfoVo;
@@ -170,13 +171,17 @@ public class UpOffServiceImpl implements IUpOffService
         }
 
         for (MaDevInfoVo devInfoVo : devInfoVos) {
+
+            devInfoVo.setDictLeaseScope(leaseScopeEnums.ID_KEY_MAP.get(devInfoVo.getLeaseScope().intValue()));
             //组装url
             List<SysFileInfo> fileInfos = sysFileInfoMapper.selectByMaId(devInfoVo.getMaId());
             for (SysFileInfo fileInfo : fileInfos) {
                 if(FileDictEnum.INSPECT_IMAGE_URL.getValue().equals(fileInfo.getDicId())){
+                    devInfoVo.setInspectImageName(fileInfo.getFileName());
                     devInfoVo.setInspectImageUrl(fileInfo.getFileUrl());
                 }
                 if(FileDictEnum.INSURE_IMAGE_URL.getValue().equals(fileInfo.getDicId())){
+                    devInfoVo.setInsureImageName(fileInfo.getFileName());
                     devInfoVo.setInsureImageUrl(fileInfo.getFileUrl());
                 }
             }
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml
index 4bd63f0..9e1769a 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml
@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             and d.type_id = t.type_id
             and d.own_co = `c`.company_id
+            and d.ma_status = '331'
         <if test="code != null and code != ''">and d.code LIKE CONCAT('%',#{code},'%')</if>
         <if test="name != null and name != ''">and t.type_name LIKE CONCAT('%',#{name},'%')</if>
         <if test="companyName != null and companyName != ''">and c.company_name LIKE CONCAT('%',#{companyName},'%')</if>
diff --git a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/SysUserController.java b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/SysUserController.java
index 7b843f1..a3c91b9 100644
--- a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/SysUserController.java
+++ b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/SysUserController.java
@@ -5,17 +5,12 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.bonus.zlpt.system.api.domain.vo.UserVo;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import com.bonus.zlpt.common.core.domain.R;
 import com.bonus.zlpt.common.core.utils.StringUtils;
@@ -66,6 +61,16 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysConfigService configService;
 
+
+
+    @GetMapping("/selectUserVo")
+    public R<UserVo> selectUserVo(@RequestParam("userId") Long userId){
+
+        UserVo userVo = userService.selectUserVo(userId);
+        System.err.println(userVo);
+        return R.ok(userService.selectUserVo(userId));
+    }
+
     /**
      * 获取用户列表
      */
diff --git a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/mapper/SysUserMapper.java b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/mapper/SysUserMapper.java
index e4b40db..c92f6e2 100644
--- a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/mapper/SysUserMapper.java
+++ b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/mapper/SysUserMapper.java
@@ -1,6 +1,8 @@
 package com.bonus.zlpt.system.mapper;
 
 import java.util.List;
+
+import com.bonus.zlpt.system.api.domain.vo.UserVo;
 import org.apache.ibatis.annotations.Param;
 import com.bonus.zlpt.system.api.domain.SysUser;
 
@@ -124,4 +126,6 @@ public interface SysUserMapper
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    UserVo selectUserVo(Long userId);
 }
diff --git a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/ISysUserService.java b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/ISysUserService.java
index a69ed80..2732813 100644
--- a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/ISysUserService.java
+++ b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/ISysUserService.java
@@ -2,6 +2,7 @@ package com.bonus.zlpt.system.service;
 
 import java.util.List;
 import com.bonus.zlpt.system.api.domain.SysUser;
+import com.bonus.zlpt.system.api.domain.vo.UserVo;
 
 /**
  * 用户 业务层
@@ -203,4 +204,7 @@ public interface ISysUserService
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    UserVo selectUserVo(Long userId);
+
 }
diff --git a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/impl/SysUserServiceImpl.java b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/impl/SysUserServiceImpl.java
index 34091c9..c36bba3 100644
--- a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/impl/SysUserServiceImpl.java
+++ b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/service/impl/SysUserServiceImpl.java
@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
+
+import com.bonus.zlpt.system.api.domain.vo.UserVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -542,4 +544,10 @@ public class SysUserServiceImpl implements ISysUserService
         return successMsg.toString();
     }
 
+    @Override
+    public UserVo selectUserVo(Long userId) {
+
+        return userMapper.selectUserVo(userId);
+    }
+
 }
diff --git a/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml b/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml
index 569bea3..ba5d764 100644
--- a/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -145,8 +145,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
-	
-	<insert id="insertUser" parameterType="com.bonus.zlpt.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
+    <select id="selectUserVo" resultType="com.bonus.zlpt.system.api.domain.vo.UserVo">
+		SELECT company_id companyId, company_name companyName, logo_url logoUrl from bm_company_info
+		WHERE creator = #{userId}
+	</select>
+
+    <insert id="insertUser" parameterType="com.bonus.zlpt.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>