diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteDeptService.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteDeptService.java
index 60083232..583b8113 100644
--- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteDeptService.java
+++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteDeptService.java
@@ -4,7 +4,7 @@ import com.yanzhu.common.core.constant.SecurityConstants;
 import com.yanzhu.common.core.constant.ServiceNameConstants;
 import com.yanzhu.common.core.domain.R;
 import com.yanzhu.system.api.domain.SysDept;
-import com.yanzhu.system.api.factory.RemoteUserFallbackFactory;
+import com.yanzhu.system.api.factory.RemoteDeptFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
  * 
  * @author ruoyi
  */
-@FeignClient(contextId = "remoteDeptService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
+@FeignClient(contextId = "remoteDeptService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteDeptFallbackFactory.class)
 public interface RemoteDeptService
 {
 
diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteFlowService.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteFlowService.java
index 754d607a..135321b5 100644
--- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteFlowService.java
+++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteFlowService.java
@@ -4,7 +4,7 @@ import com.yanzhu.common.core.constant.SecurityConstants;
 import com.yanzhu.common.core.constant.ServiceNameConstants;
 import com.yanzhu.common.core.domain.R;
 import com.yanzhu.common.core.web.domain.AjaxResult;
-import com.yanzhu.system.api.factory.RemoteLogFallbackFactory;
+import com.yanzhu.system.api.factory.RemoteFlowFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -18,7 +18,7 @@ import java.util.Map;
  *
  * @author JiangYuQi
  */
-@FeignClient(contextId = "remoteFlowService", value = ServiceNameConstants.FLOWABLE_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
+@FeignClient(contextId = "remoteFlowService", value = ServiceNameConstants.FLOWABLE_SERVICE, fallbackFactory = RemoteFlowFallbackFactory.class)
 public interface RemoteFlowService {
 
     /**
diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteProService.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteProService.java
index 044bff4c..81064a49 100644
--- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteProService.java
+++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteProService.java
@@ -4,12 +4,13 @@ import com.yanzhu.common.core.constant.SecurityConstants;
 import com.yanzhu.common.core.constant.ServiceNameConstants;
 import com.yanzhu.common.core.domain.R;
 import com.yanzhu.common.core.web.domain.AjaxResult;
-import com.yanzhu.system.api.domain.SysUser;
-import com.yanzhu.system.api.factory.RemoteFileFallbackFactory;
+import com.yanzhu.system.api.factory.RemoteProFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+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.RequestHeader;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,7 +18,7 @@ import java.util.Map;
  * 
  * @author JiangYuQi
  */
-@FeignClient(contextId = "remoteProService", value = ServiceNameConstants.MANAGE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
+@FeignClient(contextId = "remoteProService", value = ServiceNameConstants.MANAGE_SERVICE, fallbackFactory = RemoteProFallbackFactory.class)
 public interface RemoteProService
 {
 
@@ -40,6 +41,26 @@ public interface RemoteProService
     @GetMapping("/proProjectInfoSubdeptsUsers/approveSubDeptsUser/{busKey}")
     public R<AjaxResult> approveSubDeptsUser(@PathVariable("busKey") Long busKey, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    /**
+     * 项目安全承诺书文件签名章
+     *
+     * @param busKey 业务主键
+     * @param source 请求来源
+     * @return 结果
+     */
+    @GetMapping("/proProjectInfoSubdeptsUsers/subDeptsUserProSign/{busKey}")
+    public R<AjaxResult> subDeptsUserProSign(@PathVariable("busKey") Long busKey, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 班组安全承诺书文件签名章
+     *
+     * @param busKey 业务主键
+     * @param source 请求来源
+     * @return 结果
+     */
+    @GetMapping("/proProjectInfoSubdeptsUsers/subDeptsUserGroSign/{busKey}")
+    public R<AjaxResult> subDeptsUserGroSign(@PathVariable("busKey") Long busKey, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     /**
      * 系统人员添加修改信息同步
      *
diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteRoleService.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteRoleService.java
index dae91aea..c1a6aa6a 100644
--- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteRoleService.java
+++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteRoleService.java
@@ -4,17 +4,18 @@ import com.yanzhu.common.core.constant.SecurityConstants;
 import com.yanzhu.common.core.constant.ServiceNameConstants;
 import com.yanzhu.common.core.domain.R;
 import com.yanzhu.system.api.domain.SysRole;
-import com.yanzhu.system.api.domain.SysUser;
-import com.yanzhu.system.api.factory.RemoteUserFallbackFactory;
+import com.yanzhu.system.api.factory.RemoteRoleFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 /**
  * 用户服务
  * 
  * @author ruoyi
  */
-@FeignClient(contextId = "remoteRoleService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
+@FeignClient(contextId = "remoteRoleService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteRoleFallbackFactory.class)
 public interface RemoteRoleService
 {
 
diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteProFallbackFactory.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteProFallbackFactory.java
index db875eb4..79abcff8 100644
--- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteProFallbackFactory.java
+++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteProFallbackFactory.java
@@ -8,7 +8,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -39,6 +38,18 @@ public class RemoteProFallbackFactory implements FallbackFactory<RemoteProServic
                 return R.fail("审批通过信息同步失败:" + throwable.getMessage());
             }
 
+            @Override
+            public R<AjaxResult> subDeptsUserProSign(Long busKey, String source)
+            {
+                return R.fail("项目承诺书签名章失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<AjaxResult> subDeptsUserGroSign(Long busKey, String source)
+            {
+                return R.fail("班组承诺书签名章失败:" + throwable.getMessage());
+            }
+
             @Override
             public R<AjaxResult> syspushSubDeptsUser(Map<String, Object> data, String source)
             {
diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteUserFallbackFactory.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteUserFallbackFactory.java
index 21ba5635..3043c90c 100644
--- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteUserFallbackFactory.java
+++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteUserFallbackFactory.java
@@ -1,6 +1,8 @@
 package com.yanzhu.system.api.factory;
 
+import com.yanzhu.common.core.domain.R;
 import com.yanzhu.system.api.RemoteUserService;
+import com.yanzhu.system.api.domain.SysUser;
 import com.yanzhu.system.api.domain.SysUserUniopen;
 import com.yanzhu.system.api.domain.vo.WxMaLoginBody;
 import com.yanzhu.system.api.model.LoginUser;
@@ -8,10 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
-import com.yanzhu.common.core.domain.R;
-import com.yanzhu.system.api.domain.SysUser;
 
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UserTypeEnums.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UserTypeEnums.java
index f6bcee5b..5eb14347 100644
--- a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UserTypeEnums.java
+++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UserTypeEnums.java
@@ -10,7 +10,9 @@ public enum UserTypeEnums {
     FBWTDL("80", "分包代理人","fbwtdl"),
     FBXMJL("79", "分包项目经理","fbxmjl"),
     FBBZZZ("78", "分包班组组长","fbbzzz"),
-    FBLWRY("77", "分包劳务人员","key"),
+    FBLWRY("77", "分包劳务人员","fblwry"),
+    FBCLRY("76", "分包材料人员","fbclry"),
+    FBAQRY("75", "分包安全人员","fbaqry"),
     JSDWRY("66", "建设单位人员","jsdw"),
     JLDWRY("81", "监理单位人员","jldw"),
     SGDWRY("82", "施工单位人员","sgdw"),
diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/GlobalEventListener.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/GlobalEventListener.java
index e414a81d..5a079ff8 100644
--- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/GlobalEventListener.java
+++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/GlobalEventListener.java
@@ -31,8 +31,8 @@ public class GlobalEventListener extends AbstractFlowableEngineEventListener {
     @Autowired
     private RuntimeService runtimeService;
 
-    @Autowired
     @Lazy
+    @Autowired
     private RemoteProService remoteProService;
 
     @Autowired
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java
index 78264be8..fce70448 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java
@@ -141,10 +141,10 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController
      */
     @InnerAuth
     @GetMapping("/approveSubDeptsUser/{busKey}")
-    public AjaxResult approveSubDeptsUser(@PathVariable("busKey") Long busKey)
+    public R<AjaxResult> approveSubDeptsUser(@PathVariable("busKey") Long busKey)
     {
         proProjectInfoSubdeptsUsersService.approveSubDeptsUser(busKey);
-        return success();
+        return R.ok(AjaxResult.success());
     }
 
     /**
@@ -152,12 +152,33 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController
      */
     @InnerAuth
     @PostMapping("/syspushSubDeptsUser")
-    public AjaxResult syspushSubDeptsUser(@RequestBody ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers)
+    public R<AjaxResult> syspushSubDeptsUser(@RequestBody ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers)
     {
         proProjectInfoSubdeptsUsersService.pushSubdeptsUsers(proProjectInfoSubdeptsUsers);
-        return success();
+        return R.ok(AjaxResult.success());
     }
 
+    /**
+     * 项目安全承诺书文件签名章
+     */
+    @InnerAuth
+    @GetMapping("/subDeptsUserProSign/{busKey}")
+    public R<AjaxResult> subDeptsUserProSign(@PathVariable("busKey") Long busKey)
+    {
+        proProjectInfoSubdeptsUsersService.approveSubDeptsUser(busKey);
+        return R.ok(AjaxResult.success());
+    }
+
+    /**
+     * 班组安全承诺书文件签名章
+     */
+    @InnerAuth
+    @GetMapping("/subDeptsUserGroSign/{busKey}")
+    public R<AjaxResult> subDeptsUserGroSign(@PathVariable("busKey") Long busKey)
+    {
+        proProjectInfoSubdeptsUsersService.approveSubDeptsUser(busKey);
+        return R.ok(AjaxResult.success());
+    }
 
     /**
      * 修改人员进场状态
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/UserPostEnums.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/UserPostEnums.java
index ba856dc4..389266e3 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/UserPostEnums.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/UserPostEnums.java
@@ -9,6 +9,8 @@ public enum UserPostEnums {
     XMJL("2", "项目经理"),
     BZZ("3", "班组长"),
     LWGR("4", "劳务工人"),
+    CLRY("6", "材料员"),
+    AQRY("8", "安全员"),
     JSDWGL("66", "建设单位管理"),
     JLDWGL("71", "监理单位管理"),
     SGDWGL("72", "施工单位管理"),
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
index bbada3f8..5ca15a99 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
@@ -361,6 +361,34 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
                 proProjectInfoSubdeptsUsers.setSubDeptGroupName(proSubdeptsGroup.getGroupName());
 
                 sysUser.setUserType(UserTypeEnums.FBBZZZ.getCode());
+            }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.CLRY.getCode())){
+                //查询管理班组
+                ProProjectInfoSubdeptsGroup query = new ProProjectInfoSubdeptsGroup();
+                query.setProjectId(parUsers.getProjectId());
+                query.setSubDeptId(parUsers.getSubDeptId());
+                query.setGroupCode(DeptGroupEnums.MANAGE.getCode());
+                List<ProProjectInfoSubdeptsGroup> groups = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupList(query);
+
+                if(Objects.nonNull(groups) && groups.size()>0){
+                    proProjectInfoSubdeptsUsers.setSubDeptGroup(groups.get(0).getId());
+                    proProjectInfoSubdeptsUsers.setSubDeptGroupName(groups.get(0).getGroupName());
+                }
+
+                sysUser.setUserType(UserTypeEnums.FBCLRY.getCode());
+            }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.AQRY.getCode())){
+                //查询管理班组
+                ProProjectInfoSubdeptsGroup query = new ProProjectInfoSubdeptsGroup();
+                query.setProjectId(parUsers.getProjectId());
+                query.setSubDeptId(parUsers.getSubDeptId());
+                query.setGroupCode(DeptGroupEnums.MANAGE.getCode());
+                List<ProProjectInfoSubdeptsGroup> groups = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupList(query);
+
+                if(Objects.nonNull(groups) && groups.size()>0){
+                    proProjectInfoSubdeptsUsers.setSubDeptGroup(groups.get(0).getId());
+                    proProjectInfoSubdeptsUsers.setSubDeptGroupName(groups.get(0).getGroupName());
+                }
+
+                sysUser.setUserType(UserTypeEnums.FBAQRY.getCode());
             }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.LWGR.getCode())){
                 // 劳务人员绑定班组信息
                 proProjectInfoSubdeptsUsers.setSubDeptGroup(parUsers.getSubDeptGroup());
@@ -526,6 +554,34 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
                     proProjectInfoSubdeptsUsers.setSubDeptGroupName(proSubdeptsGroup.getGroupName());
                 }
                 sysUser.setUserType(UserTypeEnums.FBBZZZ.getCode());
+            }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.CLRY.getCode())){
+                //查询管理班组
+                ProProjectInfoSubdeptsGroup query = new ProProjectInfoSubdeptsGroup();
+                query.setProjectId(parUsers.getProjectId());
+                query.setSubDeptId(parUsers.getSubDeptId());
+                query.setGroupCode(DeptGroupEnums.MANAGE.getCode());
+                List<ProProjectInfoSubdeptsGroup> groups = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupList(query);
+
+                if(Objects.nonNull(groups) && groups.size()>0){
+                    proProjectInfoSubdeptsUsers.setSubDeptGroup(groups.get(0).getId());
+                    proProjectInfoSubdeptsUsers.setSubDeptGroupName(groups.get(0).getGroupName());
+                }
+
+                sysUser.setUserType(UserTypeEnums.FBCLRY.getCode());
+            }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.AQRY.getCode())){
+                //查询管理班组
+                ProProjectInfoSubdeptsGroup query = new ProProjectInfoSubdeptsGroup();
+                query.setProjectId(parUsers.getProjectId());
+                query.setSubDeptId(parUsers.getSubDeptId());
+                query.setGroupCode(DeptGroupEnums.MANAGE.getCode());
+                List<ProProjectInfoSubdeptsGroup> groups = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupList(query);
+
+                if(Objects.nonNull(groups) && groups.size()>0){
+                    proProjectInfoSubdeptsUsers.setSubDeptGroup(groups.get(0).getId());
+                    proProjectInfoSubdeptsUsers.setSubDeptGroupName(groups.get(0).getGroupName());
+                }
+
+                sysUser.setUserType(UserTypeEnums.FBAQRY.getCode());
             }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.LWGR.getCode())){
                 // 劳务人员绑定班组信息
                 proProjectInfoSubdeptsUsers.setSubDeptGroup(parUsers.getSubDeptGroup());
diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java
index 1172a099..6533afc1 100644
--- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java
+++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java
@@ -498,10 +498,8 @@ public class SysUserServiceImpl implements ISysUserService
             userRole.setUserId(userId);
             userRole.setDeptId(user.getDeptId());
             userRoleMapper.deleteUserRoleByUserRole(userRole);
-            System.out.println("user.getUserType()==>"+userPost);
             if(Objects.equals(userPost, UserTypeEnums.FBWTDL.getCode())){
                 List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getDeptId());
-                System.out.println("FBWTDL==>"+list.size());
                 if(StringUtils.isEmpty(list)){
                     //新增单位角色...
                     Long roleId = insertDeptSysRole(UserTypeEnums.FBWTDL.getInfo(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getDeptId(),user.getDeptId());
@@ -513,7 +511,6 @@ public class SysUserServiceImpl implements ISysUserService
                 userRoleMapper.batchUserRole(sysUserRoleList);
             }else if(Objects.equals(userPost, UserTypeEnums.FBXMJL.getCode())){
                 List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getDeptId());
-                System.out.println("FBXMJL==>"+list.size());
                 if(StringUtils.isEmpty(list)){
                     //新增单位角色...
                     Long roleId = insertDeptSysRole(UserTypeEnums.FBXMJL.getInfo(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getDeptId(),user.getDeptId());
@@ -525,7 +522,6 @@ public class SysUserServiceImpl implements ISysUserService
                 userRoleMapper.batchUserRole(sysUserRoleList);
             }else if(Objects.equals(userPost, UserTypeEnums.FBBZZZ.getCode())){
                 List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getDeptId());
-                System.out.println("FBBZZZ==>"+list.size());
                 if(StringUtils.isEmpty(list)){
                     //新增单位角色...
                     Long roleId = insertDeptSysRole(UserTypeEnums.FBBZZZ.getInfo(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getDeptId(),user.getDeptId());
@@ -537,7 +533,6 @@ public class SysUserServiceImpl implements ISysUserService
                 userRoleMapper.batchUserRole(sysUserRoleList);
             }else if(Objects.equals(userPost, UserTypeEnums.FBLWRY.getCode())){
                 List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBLWRY.getKeys()+"_"+user.getDeptId());
-                System.out.println("FBLWRY==>"+list.size());
                 if(StringUtils.isEmpty(list)){
                     //新增单位角色...
                     Long roleId = insertDeptSysRole(UserTypeEnums.FBLWRY.getInfo(),UserTypeEnums.FBLWRY.getKeys()+"_"+user.getDeptId(),user.getDeptId());
@@ -547,6 +542,28 @@ public class SysUserServiceImpl implements ISysUserService
                 }
                 sysUserRoleList.add(userRole);
                 userRoleMapper.batchUserRole(sysUserRoleList);
+            }else if(Objects.equals(userPost, UserTypeEnums.FBCLRY.getCode())){
+                List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBCLRY.getKeys()+"_"+user.getDeptId());
+                if(StringUtils.isEmpty(list)){
+                    //新增单位角色...
+                    Long roleId = insertDeptSysRole(UserTypeEnums.FBCLRY.getInfo(),UserTypeEnums.FBCLRY.getKeys()+"_"+user.getDeptId(),user.getDeptId());
+                    userRole.setRoleId(roleId);
+                }else{
+                    userRole.setRoleId(list.get(0).getRoleId());
+                }
+                sysUserRoleList.add(userRole);
+                userRoleMapper.batchUserRole(sysUserRoleList);
+            }else if(Objects.equals(userPost, UserTypeEnums.FBAQRY.getCode())){
+                List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBAQRY.getKeys()+"_"+user.getDeptId());
+                if(StringUtils.isEmpty(list)){
+                    //新增单位角色...
+                    Long roleId = insertDeptSysRole(UserTypeEnums.FBAQRY.getInfo(),UserTypeEnums.FBAQRY.getKeys()+"_"+user.getDeptId(),user.getDeptId());
+                    userRole.setRoleId(roleId);
+                }else{
+                    userRole.setRoleId(list.get(0).getRoleId());
+                }
+                sysUserRoleList.add(userRole);
+                userRoleMapper.batchUserRole(sysUserRoleList);
             }else if(Objects.equals(userPost, UserTypeEnums.JSDWRY.getCode())){
 
             }else if(Objects.equals(userPost, UserTypeEnums.JLDWRY.getCode())){
diff --git a/yanzhu-ui-app/miniprogram/pages/components/file-uploader/index.wxss b/yanzhu-ui-app/miniprogram/pages/components/file-uploader/index.wxss
index 9d55434d..bb2866b7 100644
--- a/yanzhu-ui-app/miniprogram/pages/components/file-uploader/index.wxss
+++ b/yanzhu-ui-app/miniprogram/pages/components/file-uploader/index.wxss
@@ -58,7 +58,7 @@
     height:180rpx;
     border: 1px dashed #28345a;
     border-radius: 10rpx;
-    background: #28345a url("https://guangzhou.sxyanzhu.com/YZLJXM/profile/xmgl/static/z_card.png") no-repeat center/100%;
+    background: #28345a url("https://xiangguan.sxyanzhu.com/profile/xmgl/static/z_card.png") no-repeat center/100%;
   }
 
   .in-fcard-click{
@@ -66,7 +66,7 @@
     height:180rpx;
     border: 1px dashed #28345a;
     border-radius: 10rpx;
-    background: #28345a url("https://guangzhou.sxyanzhu.com/YZLJXM/profile/xmgl/static/f_card.png") no-repeat center/100%;
+    background: #28345a url("https://xiangguan.sxyanzhu.com/profile/xmgl/static/f_card.png") no-repeat center/100%;
   }
 
   .in-img-div image{
diff --git a/yanzhu-ui-app/miniprogram/pages/login/login.wxml b/yanzhu-ui-app/miniprogram/pages/login/login.wxml
index 3c4f0dee..1653f44c 100644
--- a/yanzhu-ui-app/miniprogram/pages/login/login.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/login/login.wxml
@@ -1,6 +1,6 @@
 <!--pages/login/login.wxml-->
 <view class="login_logo">
-  <image src="https://guangzhou.sxyanzhu.com/YZLJXM/profile/xmgl/static/sys_logo.png"></image>
+  <image src="https://xiangguan.sxyanzhu.com/profile/xmgl/static/sys_logo.png"></image>
 </view>
 <view class="login_title">
   <text>数字工程项目管理系统</text>
diff --git a/yanzhu-ui-app/miniprogram/pages/login/login.wxss b/yanzhu-ui-app/miniprogram/pages/login/login.wxss
index 6d3488c7..23e6cb5e 100644
--- a/yanzhu-ui-app/miniprogram/pages/login/login.wxss
+++ b/yanzhu-ui-app/miniprogram/pages/login/login.wxss
@@ -21,7 +21,7 @@ page {
   font-weight: bold;
   text-align: center;
   word-spacing: 30rpx;
-  background: url("https://guangzhou.sxyanzhu.com/YZLJXM/profile/static/yanzhu_title.png") no-repeat left/100% 100%;
+  background: url("https://xiangguan.sxyanzhu.com/profile/static/yanzhu_title.png") no-repeat left/100% 100%;
 }
 
 .login_bg {
@@ -47,7 +47,7 @@ page {
 }
 
 .login_input .name {
-  background: url("https://guangzhou.sxyanzhu.com/YZLJXM/profile/static/login_name.png") no-repeat left/40rpx;
+  background: url("https://xiangguan.sxyanzhu.com/profile/static/login_name.png") no-repeat left/40rpx;
   border-bottom: 1px solid #5e6ea2;
   height: 100rpx;
   width: 85%;
@@ -56,7 +56,7 @@ page {
 }
 
 .login_input .pass {
-  background: url("https://guangzhou.sxyanzhu.com/YZLJXM/profile/static/login_pass.png") no-repeat left/40rpx;
+  background: url("https://xiangguan.sxyanzhu.com/profile/static/login_pass.png") no-repeat left/40rpx;
   border-bottom: 1px solid #5e6ea2;
   height: 100rpx;
   width: 85%;
@@ -65,7 +65,7 @@ page {
 }
 
 .login_input .code {
-  background: url("https://guangzhou.sxyanzhu.com/YZLJXM/profile/static/login_code.png") no-repeat left/40rpx;
+  background: url("https://xiangguan.sxyanzhu.com/profile/static/login_code.png") no-repeat left/40rpx;
   border-bottom: 1px solid #5e6ea2;
   height: 100rpx;
   width: 74%;
diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml
index ac284c32..5c1f909d 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml
@@ -70,7 +70,7 @@
         <view class="module_title module_title_padding">
             <view>{{subDeptData.projectName}}</view>
         </view>
-        <view class="inspect_info" wx:if="{{options.category=='1' || options.category=='2' || options.category=='3' || options.category=='4'}}">
+        <view class="inspect_info" wx:if="{{options.category=='1' || options.category=='2' || options.category=='3' || options.category=='4' || options.category=='6' || options.category=='8'}}">
             <view class="inspect_overview_list">
                 <van-row>
                     <van-col span="8"><text class="color_purple">项目单位</text></van-col>
diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml
index 01898b13..8e60ecd2 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml
@@ -70,7 +70,7 @@
         <view class="module_title module_title_padding">
             <view>{{subDeptData.projectName}}</view>
         </view>
-        <view class="inspect_info" wx:if="{{options.category=='1' || options.category=='2' || options.category=='3' || options.category=='4'}}">
+        <view class="inspect_info" wx:if="{{options.category=='1' || options.category=='2' || options.category=='3' || options.category=='4' || options.category=='6' || options.category=='8'}}">
             <view class="inspect_overview_list">
                 <van-row>
                     <van-col span="8"><text class="color_purple">项目单位</text></van-col>
diff --git a/yanzhu-ui-app/miniprogram/pages/project_info/index.js b/yanzhu-ui-app/miniprogram/pages/project_info/index.js
index b6352862..d80a180b 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_info/index.js
+++ b/yanzhu-ui-app/miniprogram/pages/project_info/index.js
@@ -29,22 +29,22 @@ Page({
         projectDeptsList: [],
         deptTypes: [{
             "name": "建设单位",
-            "iconSrc": "https://guangzhou.sxyanzhu.com/YZLJXM/profile/icon/jsdw.png"
+            "iconSrc": "https://xiangguan.sxyanzhu.com/profile/icon/jsdw.png"
         }, {
             "name": "监理单位",
-            "iconSrc": "https://guangzhou.sxyanzhu.com/YZLJXM/profile/icon/jldw.png"
+            "iconSrc": "https://xiangguan.sxyanzhu.com/profile/icon/jldw.png"
         }, {
             "name": "设计单位",
-            "iconSrc": "https://guangzhou.sxyanzhu.com/YZLJXM/profile/icon/sjdw.png"
+            "iconSrc": "https://xiangguan.sxyanzhu.com/profile/icon/sjdw.png"
         }, {
             "name": "检测单位",
-            "iconSrc": "https://guangzhou.sxyanzhu.com/YZLJXM/profile/icon/jcjg.png"
+            "iconSrc": "https://xiangguan.sxyanzhu.com/profile/icon/jcjg.png"
         }, {
             "name": "勘察单位",
-            "iconSrc": "https://guangzhou.sxyanzhu.com/YZLJXM/profile/icon/fbdw.png"
+            "iconSrc": "https://xiangguan.sxyanzhu.com/profile/icon/fbdw.png"
         }, {
             "name": "总包单位",
-            "iconSrc": "https://guangzhou.sxyanzhu.com/YZLJXM/profile/icon/zbdw.png"
+            "iconSrc": "https://xiangguan.sxyanzhu.com/profile/icon/zbdw.png"
         }],
         active: 0,
         projectId: '',
@@ -356,7 +356,7 @@ Page({
                 subDeptUserInfo: res.data[0]
             });
              //劳务人员信息
-             if ((app.globalData.subDeptUserData.subDeptType=='1' || app.globalData.subDeptUserData.subDeptType=='4' || app.globalData.subDeptUserData.subDeptType=='5') && app.globalData.subDeptUserData.userPost != '4') {
+             if ((app.globalData.subDeptUserData.subDeptType=='1' || app.globalData.subDeptUserData.subDeptType=='4' || app.globalData.subDeptUserData.subDeptType=='5') && app.globalData.subDeptUserData.userPost != '4' && app.globalData.subDeptUserData.userPost != '6' && app.globalData.subDeptUserData.userPost != '8') {
                 //统计劳务人员信息
                 this.getSubDeptsUsers(app.globalData.useProjectId);
                 this.initSubDeptDaysCharts(app.globalData.useProjectId);
@@ -367,7 +367,7 @@ Page({
                 this.getSubDeptsAttendanceView(app.globalData.useProjectId);
             }
             //人员出勤信息
-            if (app.globalData.subDeptUserData.userPost == '4') {
+            if (app.globalData.subDeptUserData.userPost == '4' || app.globalData.subDeptUserData.userPost == '6' || app.globalData.subDeptUserData.userPost == '8') {
                 //统计劳务人员信息
                 this.getUsersAttendanceView(app.globalData.useProjectId);
             }
diff --git a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml
index 2b66116e..db0bd34a 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml
@@ -78,7 +78,7 @@
 		</van-collapse>
 	</view>
 	
-	<view class="echarts_max" wx:if="{{(subDeptUserInfo.subDeptType=='1' || subDeptUserInfo.subDeptType=='4' || subDeptUserInfo.subDeptType=='5') && subDeptUserInfo.userPost!='4'}}">
+	<view class="echarts_max" wx:if="{{(subDeptUserInfo.subDeptType=='1' || subDeptUserInfo.subDeptType=='4' || subDeptUserInfo.subDeptType=='5') && subDeptUserInfo.userPost!='4' && subDeptUserInfo.userPost!='6' && subDeptUserInfo.userPost!='8'}}">
 		<view class="echarts_min">
 			<view class="eharts_title module_title_flex">
 				劳务人员
@@ -114,7 +114,7 @@
 		</view>
 	</view>
 
-	<view class="echarts_max" wx:if="{{(subDeptUserInfo.subDeptType=='1' || subDeptUserInfo.subDeptType=='4' || subDeptUserInfo.subDeptType=='5') && subDeptUserInfo.userPost!='4'}}">
+	<view class="echarts_max" wx:if="{{(subDeptUserInfo.subDeptType=='1' || subDeptUserInfo.subDeptType=='4' || subDeptUserInfo.subDeptType=='5') && subDeptUserInfo.userPost!='4' && subDeptUserInfo.userPost!='6' && subDeptUserInfo.userPost!='8'}}">
 		<view class="echarts_min">
 			<view class="eharts_title module_title_flex">
 				今日出勤
@@ -143,7 +143,7 @@
 			</view>
 		</view>
 	</view>
-	<view class="echarts_max bt30" wx:if="{{(subDeptUserInfo.subDeptType=='4' || subDeptUserInfo.subDeptType=='5') && subDeptUserInfo.userPost!='4'}}">
+	<view class="echarts_max bt30" wx:if="{{(subDeptUserInfo.subDeptType=='4' || subDeptUserInfo.subDeptType=='5') && subDeptUserInfo.userPost!='4' && subDeptUserInfo.userPost!='6' && subDeptUserInfo.userPost!='8'}}">
 		<view class="echarts_min">
 			<view class="eharts_title module_title_flex">
 				我的二维码
@@ -177,7 +177,7 @@
 		</view>
 	</view>
 
-	<view class="echarts_max" wx:if="{{subDeptUserInfo.userPost=='4'}}">
+	<view class="echarts_max" wx:if="{{subDeptUserInfo.userPost=='4' || subDeptUserInfo.userPost=='6' || subDeptUserInfo.userPost=='8'}}">
 		<view class="echarts_min">
 			<view class="eharts_title module_title_flex">
 				最近出勤
@@ -235,7 +235,7 @@
 </view>
 
 <!-- 底部导航 -->
-<van-tabbar wx:if="{{subDeptUserInfo.userPost!='4'}}" active="{{ active }}" bind:change="onChange" active-color="#ffffff" inactive-color="#7d95d6">
+<van-tabbar wx:if="{{subDeptUserInfo.userPost!='4' && subDeptUserInfo.userPost!='6' && subDeptUserInfo.userPost!='8'}}" active="{{ active }}" bind:change="onChange" active-color="#ffffff" inactive-color="#7d95d6">
 	<van-tabbar-item>
 		<image slot="icon" src="/images/footer_5.png" mode="aspectFit" style="width:40rpx; height: 40rpx;" />
 		<image slot="icon-active" src="/images/foot_5.png" mode="aspectFit" style="width:40rpx; height: 40rpx;" />
diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js
index fe470d1c..eca6672f 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js
+++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js
@@ -162,6 +162,14 @@ Page({
             "id": "3",
             "text": "班组长"
           });
+          _userPostList.push({
+            "id": "6",
+            "text": "材料员"
+          });
+          _userPostList.push({
+            "id": "8",
+            "text": "安全员"
+          });
         }
         title = "参建单位管理人员信息登记";
       } else if (options.SIGID == '4') {
@@ -379,7 +387,7 @@ Page({
               } else {
                 this.setData({
                   userPhoneNumber: phoneNumber,
-                  "form.phoneNumber": phoneNumber,
+                  "form.userPhone": phoneNumber,
                 });
               }
             });
@@ -549,6 +557,13 @@ Page({
         item.selected = false;
       })
       _busExamQuestions[idxs[0]].questionOption[idxs[1]].selected = true;
+      let _userAnswer = [];
+      _busExamQuestions[idxs[0]].questionOption.forEach(item =>{
+        if(item.selected){
+          _userAnswer.push(item.opt);
+        }
+      });
+      _busExamQuestions[idxs[0]].userAnswer = _userAnswer.toString();
       this.setData({
         busExamQuestions: _busExamQuestions
       });
@@ -564,6 +579,13 @@ Page({
       let idxs = e.currentTarget.dataset.id.split('_');
       let _busExamQuestions = this.data.busExamQuestions;
       _busExamQuestions[idxs[0]].questionOption[idxs[1]].selected = !_busExamQuestions[idxs[0]].questionOption[idxs[1]].selected;
+      let _userAnswer = [];
+      _busExamQuestions[idxs[0]].questionOption.forEach(item =>{
+        if(item.selected){
+          _userAnswer.push(item.opt);
+        }
+      });
+      _busExamQuestions[idxs[0]].userAnswer = _userAnswer.toString();
       this.setData({
         busExamQuestions: _busExamQuestions
       });
@@ -1046,6 +1068,16 @@ Page({
     })
   },
 
+  /**
+   * 选中岗位级别
+   * @param {*} e 
+   */
+  onChageUserPost(e) {
+    this.setData({
+      "form.userPost": e.detail.id
+    })
+  },
+
   /**
    * 选中工种类型
    * @param {*} e 
@@ -1054,7 +1086,7 @@ Page({
     //设置工种岗位
     let craftPostList = [];
     this.data.craftPostAllOrginList.forEach(item => {
-      if (item.remark == e.detail.id) {
+      if (item.cssClass == e.detail.id) {
         craftPostList.push({
           "id": item.dictValue,
           "text": item.dictLabel
@@ -1451,9 +1483,8 @@ Page({
       form,
       userPost
     } = this.data;
-    debugger
     //数据效验
-    if (userPost == '3') {
+    if (userPost == '3' || userPost == '6' || userPost == '8') {
       if (!form.craftType) {
         app.toast("请选择工种类型！");
         return false;
@@ -1488,7 +1519,7 @@ Page({
       app.toast("请填写身份证号！");
       return false;
     }
-    if (!form.phoneNumber) {
+    if (!form.userPhone) {
       app.toast("请填写联系电话！");
       return false;
     }
@@ -1603,7 +1634,6 @@ Page({
       //验证图片上传完毕
       if (uploads.length == uploadFiles.length) {
         let userInfos = {};
-        userInfos.phonenumber = _form.phoneNumber;
         userInfos.nativePlace = _form.nativePlace;
         userInfos.address = _form.address;
         userInfos.emergencyContact = _form.emergencyContact;
diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml
index 7783b5fc..758c0e71 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml
@@ -1,13 +1,13 @@
 <!-- 游客一键登录 -->
 <view wx:if="{{!userPhoneNumber}}" class="page">
     <view class="login_logo">
-        <image src="https://guangzhou.sxyanzhu.com/YZLJXM/profile/xmgl/static/sys_logo.png"></image>
+        <image src="https://xiangguan.sxyanzhu.com/profile/xmgl/static/sys_logo.png"></image>
     </view>
     <view class="login_title">
         <text>数字工程项目管理系统</text>
     </view>
     <view class="login_bg">
-        <image src="https://guangzhou.sxyanzhu.com/YZLJXM/profile/static/yanzhu_logo_blue.png"></image>
+        <image src="https://xiangguan.sxyanzhu.com/profile/static/yanzhu_logo_blue.png"></image>
         <!--<view>
     <van-radio :name="clause" shape>同意数字工程系统《用户隐私协议》</van-radio> 
     </view>	-->
@@ -284,7 +284,7 @@
         </view>
     </view>
 
-    <view wx:if="{{userPost=='3'}}">
+    <view wx:if="{{userPost=='3' || userPost=='6' || userPost=='8'}}">
         <view class="header_title">
             <view class="header_title_row">
                 <view class="header_name">{{title}}</view>
@@ -303,7 +303,7 @@
                 <view class="inspect_info_list">
                     <view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">岗位级别</view>
                     <view class="inspect_info_content">
-                        <voucher-select columns="{{userPostList}}" placeholder="请选择岗位级别" selectValue="{{form.userPost}}"></voucher-select>
+                        <voucher-select columns="{{userPostList}}" placeholder="请选择岗位级别" bindchange="onChageUserPost" selectValue="{{form.userPost}}"></voucher-select>
                     </view>
                 </view>
                 <view class="inspect_info_list">
@@ -594,7 +594,7 @@
         <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
 
         <view class="kaoshimianban_1">
-            <jyq-result iconPath="https://guangzhou.sxyanzhu.com/YZLJXM/profile/icon/dd.png" title="考试剩余时间{{timeStr}}" description="试卷满分{{busExamInfos.fullMark}}，及格分数{{busExamInfos.passMark}}，请加油努力。" />
+            <jyq-result iconPath="https://xiangguan.sxyanzhu.com/profile/icon/dd.png" title="考试剩余时间{{timeStr}}" description="试卷满分{{busExamInfos.fullMark}}，及格分数{{busExamInfos.passMark}}，请加油努力。" />
             <!-- <view class="time-unit">
                 <text class="time-unit-number">离考试结束：{{ timeStr }}</text>
             </view>
@@ -646,6 +646,7 @@
                                         <view class="content {{pancan.selected?'ac':''}}">{{pancan.opt}} : {{pancan.result}}</view>
                                     </view>
                                 </view>
+                                <view class="inspect_list_info_position crd" wx:if="{{item.userAnswer && item.answer!=item.userAnswer}}">正确答案：<text class="color_purple">{{item.answer}}</text><text class="timeline_for_state_2 rdc">错误</text></view>
                             </view>
                         </view>
                     </view>
@@ -667,8 +668,8 @@
             <project-select init="{{initProject}}"></project-select>
             <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
             <view class="kaoshimianban">
-                <jyq-result wx:if="{{busExamInfos.passMark<=busExamInfos.userMark}}" iconPath="https://guangzhou.sxyanzhu.com/YZLJXM/profile/icon/cg.png" title="恭喜！考试通过" description="本次考试已顺利完成，您可以去签署安全承诺文件了。" actionText="立 即 签 署" bind:action="startSignFile" />
-                <jyq-result wx:if="{{busExamInfos.passMark>busExamInfos.userMark}}" iconPath="https://guangzhou.sxyanzhu.com/YZLJXM/profile/icon/sb.png" title="很遗憾！考试未通过" description="本次考试未通过，重新考试通过后您才可以签署安全承诺文件，请返回学习或继续考试。" actionText="继 续 考 试" bind:action="anewBusEduQuestion" descActionText="返 回 学 习" bind:descAction="onClickPreviousNode" />
+                <jyq-result wx:if="{{busExamInfos.passMark<=busExamInfos.userMark}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/cg.png" title="恭喜！考试通过" description="本次考试已顺利完成，您可以去签署安全承诺文件了。" actionText="立 即 签 署" bind:action="startSignFile" />
+                <jyq-result wx:if="{{busExamInfos.passMark>busExamInfos.userMark}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/sb.png" title="很遗憾！考试未通过" description="本次考试未通过，重新考试通过后您才可以签署安全承诺文件，请返回学习或继续考试。" actionText="继 续 考 试" bind:action="anewBusEduQuestion" descActionText="返 回 学 习" bind:descAction="onClickPreviousNode" />
                 <!-- <view class="time-unit">
                     <text class="timeline_for_state_2 timeline_for_state_6" wx:if="{{busExamInfos.passMark>busExamInfos.userMark}}">很 遗 憾 ！ 考 试 不 通 过</text><text class="timeline_for_state_1 timeline_for_state_6" wx:if="{{busExamInfos.passMark<=busExamInfos.userMark}}">恭 喜 ！ 考 试 通 过</text>
                 </view>
@@ -762,7 +763,7 @@
                     <view class="title">安全防护用品使用图解</view>
                     <view class="header">进入施工现场必须根据要求按照下图要求佩戴好相应安全防护用品。</view>
                     <view class="image">
-                        <image src="https://guangzhou.sxyanzhu.com/YZLJXM/profile/static/file_doc.png" width=""></image>
+                        <image src="https://xiangguan.sxyanzhu.com/profile/static/file_doc.png" width=""></image>
                     </view>
                     <view class="header">本人已经掌握安全防护用品佩戴方法，并严格遵守！</view>
                     <view class="foot">承诺人（签字）：{{fileForm.fName}}</view>
@@ -861,9 +862,9 @@
             <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
             <view class="kaoshimianban_8">
                 <view class="kaoshimianban_9">
-                    <jyq-result wx:if="{{form.approveStatus!='100' && form.approveStatus!='11'}}" iconPath="https://guangzhou.sxyanzhu.com/YZLJXM/profile/icon/dd.png" title="信息审核中" description="您的信息已登记完成，相关人员正在审核您的信息，请耐心等待。" actionText="下 载 承 诺 书" bind:action="downloadSignetFiles" />
-                    <jyq-result wx:if="{{form.approveStatus=='100'}}" iconPath="https://guangzhou.sxyanzhu.com/YZLJXM/profile/icon/cg.png" title="恭喜，审核通过" description="您的信息已登记完成。" actionText="下 载 承 诺 书" bind:action="downloadSignetFiles" />
-                    <jyq-result wx:if="{{busExamInfos.passMark>busExamInfos.userMark}}" iconPath="https://guangzhou.sxyanzhu.com/YZLJXM/profile/icon/sb.png" title="很遗憾！审核未通过" description="您的信息已登记完成，但未审核通过。"/>
+                    <jyq-result wx:if="{{form.approveStatus!='100' && form.approveStatus!='11'}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/dd.png" title="信息审核中" description="您的信息已登记完成，相关人员正在审核您的信息，请耐心等待。" actionText="下 载 承 诺 书" bind:action="downloadSignetFiles" />
+                    <jyq-result wx:if="{{form.approveStatus=='100'}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/cg.png" title="恭喜，审核通过" description="您的信息已登记完成。" actionText="下 载 承 诺 书" bind:action="downloadSignetFiles" />
+                    <jyq-result wx:if="{{busExamInfos.passMark>busExamInfos.userMark}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/sb.png" title="很遗憾！审核未通过" description="您的信息已登记完成，但未审核通过。"/>
                 </view>
             </view>
         </view>
diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxss b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxss
index 5fc1132c..f5f46cc1 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxss
+++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxss
@@ -22,7 +22,7 @@
   font-weight: bold;
   text-align: center;
   word-spacing: 30rpx;
-  background: url("https://guangzhou.sxyanzhu.com/YZLJXM/profile/static/yanzhu_title.png") no-repeat left/100% 100%;
+  background: url("https://xiangguan.sxyanzhu.com/profile/static/yanzhu_title.png") no-repeat left/100% 100%;
 }
 
 .login_bg {
diff --git a/yanzhu-ui-app/miniprogram/project.private.config.json b/yanzhu-ui-app/miniprogram/project.private.config.json
index cef99850..1abc6579 100644
--- a/yanzhu-ui-app/miniprogram/project.private.config.json
+++ b/yanzhu-ui-app/miniprogram/project.private.config.json
@@ -11,7 +11,7 @@
                 {
                     "name": "pages/project_qr/index",
                     "pathName": "pages/project_qr/index",
-                    "query": "QRPID=132&SIGID=1",
+                    "query": "QRPID=132&SIGID=3&PARID=35",
                     "launchMode": "default",
                     "scene": null
                 },