commit

src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java

@@ -140,7 +140,8 @@ public class FlowTodoCenterController {
                   ins.createdAt,
                   ins.variable ->> '$.instanceName' AS instanceName,
                   GROUP_CONCAT(DISTINCT t.displayName) as taskName,
-                  cat.`name` categoryName
+                  cat.`name` categoryName,
+                  def.instanceViewUrl formKey
                 FROM
                   wf_process_instance ins
                   LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskState = 10

src/main/java/com/budwk/app/sys/services/impl/SysDataUnitPullServiceImpl.java

@@ -92,6 +92,6 @@ public class SysDataUnitPullServiceImpl extends BaseServiceImpl<Sys_unit> implem
         }
         log.info("本次拉取单位数据，新增{}条，更新{}条", insertList.size(), updateList.size());
         dao().insert(insertList);
-        dao().update(updateList);
+        dao().updateIgnoreNull(updateList);
     }
 }

src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetServiceImpl.java

@@ -51,6 +51,7 @@ public class AssetServiceImpl extends BaseServiceImpl<Asset> implements AssetSer
         }
         if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
             cnd.and("t1.assetUseUnionId", "=", SecurityUtil.getUnionId());
+            cnd.and("t1.assetTypeCode", "=", "2");
         }
         cnd.andEX("t1.assetUseUnionId", "=", pageForm.getAssetUseUnionId());
         cnd.andEX("t1.assetCategoryId", "=", pageForm.getAssetCategoryId());