更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/orgUser/OrganizationUserSearch.java

@@ -85,8 +85,10 @@ public class OrganizationUserSearch extends SuperSearch {
     @Schema(description = "审核用户名称")
     private String reViewUserName;
 
+    @Schema(description = "审核开始")
     private Long startReViewTime;
 
+    @Schema(description = "审核结束")
     private Long endReViewTime;
 
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/OrganizationUserDaoImpl.java

@@ -133,8 +133,8 @@ public class OrganizationUserDaoImpl extends BaseImpl implements OrganizationUse
         // 部门
         List<String> departmentIds = param.getDepartmentIds();
         if (ObjectUtils.isNotEmpty(departmentIds)) {
-            List<Department> roles = departmentDao.findByIdIn(departmentIds);
-            criteria.and("departments").in(roles);
+            List<Department> departments = departmentDao.findByIdIn(departmentIds);
+            criteria.and("department").in(departments);
         }
 
         // 搜索项目的用户

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/order/OrderOpenApiService.java

@@ -85,6 +85,10 @@ public class OrderOpenApiService extends SuperService {
         if (param.getAmount() == null || BigDecimal.ZERO.compareTo(param.getAmount()) >= 0) {
             return ResultContent.buildFail("消费金额不能为空或小于等于0");
         }
+        ExpenseFlow temp = expenseFlowDao.findTopByOrderNoOrderByCreateTimeDesc(param.getOrderNo());
+        if (ObjectUtils.isNotEmpty(temp)) {
+            return ResultContent.buildFail(String.format("订单已存在：%s", param.getOrderNo()));
+        }
         String mqttDataId = param.getOrderNo();
         ExpenseFlow expenseFlow = expenseFlowService.init(mqttDataId);
         if (ObjectUtils.isEmpty(expenseFlow)) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationUserServiceImpl.java

@@ -451,10 +451,6 @@ public class OrganizationUserServiceImpl extends SuperService {
         if (StringUtils.isEmpty(param.getUserId())) {
             return ResultContent.buildFail("userId不能为空");
         }
-        // 绑定的机构可以为空 02-24
-//        if (StringUtils.isEmpty(param.getOrgOid())) {
-//            return ResultContent.buildFail("orgOid不能为空");
-//        }
 
         UserAccount userAccount = userCountDao.findTopByUserId(param.getUserId());
         if (ObjectUtils.isEmpty(userAccount)) {
@@ -545,7 +541,7 @@ public class OrganizationUserServiceImpl extends SuperService {
         if (ObjectUtils.isNotEmpty(param.getDepartmentId())) {
             department = departmentDao.findTopById(param.getDepartmentId());
         }
-        // 位置信息
+        // 职位信息
         DictInfo position = null;
         if (StringUtils.isNotEmpty(param.getPositionId())) {
             position = dictInfoDao.findTopById(param.getPositionId());