CrudBizModel增加对于missing状态的识别处理

entropy-cloud · Jul 29, 2024 · f1566f3 · f1566f3
1 parent 305aba1
commit f1566f3
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/nop-biz/src/main/java/io/nop/biz/crud/CrudBizModel.java b/nop-biz/src/main/java/io/nop/biz/crud/CrudBizModel.java
@@ -785,7 +785,7 @@ protected T doGetEntity(@Name("id") String id,
 
         IEntityDao<T> dao = dao();
         T entity = dao.getEntityById(id);
-        if (entity == null) {
+        if (entity == null || entity.orm_state().isMissing()) {
             if (ignoreUnknown)
                 return null;
             throw new UnknownEntityException(dao.getEntityName(), id);
@@ -1110,14 +1110,16 @@ public void tryDelete(@Name("id") String id, IServiceContext context) {
     @Description("@i18n:biz.batchUpdate|批量修改")
     @BizMutation
     public void batchUpdate(@Name("ids") Set<String> ids, @Name("data") Map<String, Object> data,
+                            @Optional @Name("ignoreUnknown") boolean ignoreUnknown,
                             IServiceContext context) {
         if (CollectionHelper.isEmpty(ids) || CollectionHelper.isEmptyMap(data))
             return;
 
-        dao().batchGetEntitiesByIds(ids);
-        for (String id : ids) {
+        List<T> entityList = ignoreUnknown ?
+                dao().tryBatchGetEntitiesByIds(ids) : dao().batchGetEntitiesByIds(ids);
+        for (T entity: entityList) {
             Map<String, Object> copy = new LinkedHashMap<>(data);
-            copy.put(GraphQLConstants.PROP_ID, id);
+            copy.put(GraphQLConstants.PROP_ID, entity.orm_idString());
             update(copy, context);
         }
     }