diff --git a/cf-module-infra/cf-module-infra-biz/src/main/resources/bootstrap-test.yaml b/cf-module-infra/cf-module-infra-biz/src/main/resources/bootstrap-test.yaml
index 90fc424cd..805e8c69c 100644
--- a/cf-module-infra/cf-module-infra-biz/src/main/resources/bootstrap-test.yaml
+++ b/cf-module-infra/cf-module-infra-biz/src/main/resources/bootstrap-test.yaml
@@ -4,6 +4,8 @@ spring:
   cloud:
     nacos:
       server-addr: 192.168.1.204:8848
+      username: nacos
+      password: nacos
       discovery:
         namespace: imes-test # 命名空间。这里使用 dev 开发环境
         metadata:
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
index 2c68afde6..6bf2d33b4 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
@@ -349,16 +349,17 @@ public class OrderServiceImpl implements OrderService {
         List<PlateDO> plateDO = (List<PlateDO>) listMap.get("platesDO");
         List<PlateDetail> plateDetail = (List<PlateDetail>) listMap.get("plateDetail");
         List<OrderItemDO> itemDO = (List<OrderItemDO>) listMap.get("itemDO");
+        List<OrderPartsRemark> partsRemark = (List<OrderPartsRemark>) listMap.get("partsRemark");
 
         Map<String, List<?>> map = getPlateGoods(goodsDO);// 检验商品板材信息是否存在
         goodsDO = (List<GoodsDO>) map.get("goodsDO");
         List<PlateGoodDO> plateGoodDOS = (List<PlateGoodDO>) map.get("plateGoodDOLists");
         validateCustomOrderNoExists(order.get(0).getCustomOrderNo());
 
-//        orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0), goodsDO, plateGoodDOS);
-//        List<OrderModelDO> orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class);
-//        orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId()));
-//        orderInputProcessor.batchSaveModel(orderModelDOs);
+        orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0), goodsDO, plateGoodDOS);
+        List<OrderModelDO> orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class);
+        orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId()));
+        orderInputProcessor.batchSaveModel(orderModelDOs);
         return order.get(0).getId();
     }
 
@@ -528,9 +529,9 @@ public class OrderServiceImpl implements OrderService {
         goodsDO = (List<GoodsDO>) map.get("goodsDO");
         List<PlateGoodDO> plateGoodDOS = (List<PlateGoodDO>) map.get("plateGoodDOLists");
 
-//        validateCustomOrderNoExists(orderDO.getCustomOrderNo());
-//        orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO, goodsDO, plateGoodDOS);
-//        orderInputProcessor.batchSaveModel(orderModelDOS);
+        validateCustomOrderNoExists(orderDO.getCustomOrderNo());
+        orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO, goodsDO, plateGoodDOS);
+        orderInputProcessor.batchSaveModel(orderModelDOS);
 
     }
 
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/bootstrap-test.yaml b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/bootstrap-test.yaml
index 90fc424cd..805e8c69c 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/bootstrap-test.yaml
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/bootstrap-test.yaml
@@ -4,6 +4,8 @@ spring:
   cloud:
     nacos:
       server-addr: 192.168.1.204:8848
+      username: nacos
+      password: nacos
       discovery:
         namespace: imes-test # 命名空间。这里使用 dev 开发环境
         metadata:
diff --git a/cf-module-report/cf-module-report-biz/src/main/resources/bootstrap-test.yaml b/cf-module-report/cf-module-report-biz/src/main/resources/bootstrap-test.yaml
index 90fc424cd..805e8c69c 100644
--- a/cf-module-report/cf-module-report-biz/src/main/resources/bootstrap-test.yaml
+++ b/cf-module-report/cf-module-report-biz/src/main/resources/bootstrap-test.yaml
@@ -4,6 +4,8 @@ spring:
   cloud:
     nacos:
       server-addr: 192.168.1.204:8848
+      username: nacos
+      password: nacos
       discovery:
         namespace: imes-test # 命名空间。这里使用 dev 开发环境
         metadata:
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java
index 82f59af63..1cfe3e339 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java
@@ -109,7 +109,7 @@ public class PermissionController {
     @PostMapping("/bath-assign-user-role")
     @PreAuthorize("@ss.hasPermission('system:permission:assign-user-role')")
     public CommonResult<Boolean> bathAssignUserRole(@Validated @RequestBody PermissionAssignRoleUserReqVO reqVO) {
-//        permissionService.batchAssignRoleUsers(reqVO);
+        permissionService.batchAssignRoleUsers(reqVO);
         return success(true);
     }
 
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java
index 663917b27..be9d8f9a4 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleRespVO.java
@@ -54,4 +54,6 @@ public class RoleRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
     private LocalDateTime createTime;
 
+    @Schema(description = "组织id", example = "1")
+    private Long organId;
 }
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
index 63b8706e7..403edf63e 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
@@ -271,7 +271,7 @@ public class PermissionServiceImpl implements PermissionService {
 
     @Override
     @DSTransactional // 多数据源，使用 @DSTransactional 保证本地事务，以及数据源的切换
-    @CacheEvict(value = RedisKeyConstants.USER_ROLE_ID_LIST, key = "#userId")
+    @CacheEvict(value = RedisKeyConstants.USER_ROLE_ID_LIST, allEntries = true)
     public void batchAssignRoleUsers(PermissionAssignRoleUserReqVO reqVO) {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         assert loginUser != null;