From 9d4a75497dc44710d6612b9d9abde0f4eaf13981 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 16 Dec 2021 14:25:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=9C=AA=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/qm/views.py | 2 +- hb_server/apps/wf/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/qm/views.py b/hb_server/apps/qm/views.py index 32d0334..2a11f72 100644 --- a/hb_server/apps/qm/views.py +++ b/hb_server/apps/qm/views.py @@ -84,7 +84,7 @@ class TestRecordViewSet(ListModelMixin, UpdateModelMixin, RetrieveModelMixin, De obj = self.get_object() # 校验是否有未填项目 if obj.type != TestRecord.TEST_PROCESS_RE: - if TestRecordItem.objects.filter(field_value__isnull=True, is_hidden=False).exists(): + if TestRecordItem.objects.filter(field_value__isnull=True, is_hidden=False, test_record=obj).exists(): raise exceptions.APIException('存在未填写项目') with transaction.atomic(): WpmServies.update_wproduct_by_test(obj, request.user) diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 5d6625d..f343e2d 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -15,7 +15,7 @@ class Workflow(CommonAModel): name = models.CharField('名称', max_length=50) key = models.CharField('工作流标识', unique=True, max_length=20, null=True, blank=True) sn_prefix = models.CharField('流水号前缀', max_length=50, default='hb') - description = models.CharField('描述', max_length=200) + description = models.CharField('描述', max_length=200, null=True, blank=True) view_permission_check = models.BooleanField('查看权限校验', default=True, help_text='开启后，只允许工单的关联人(创建人、曾经的处理人)有权限查看工单') limit_expression = models.JSONField('限制表达式', default=dict, blank=True, help_text='限制周期({"period":24} 24小时), 限制次数({"count":1}在限制周期内只允许提交1次), 限制级别({"level":1} 针对(1单个用户 2全局)限制周期限制次数,默认特定用户);允许特定人员提交({"allow_persons":"zhangsan,lisi"}只允许张三提交工单,{"allow_depts":"1,2"}只允许部门id为1和2的用户提交工单，{"allow_roles":"1,2"}只允许角色id为1和2的用户提交工单)') display_form_str = models.JSONField('展现表单字段', default=list, blank=True, help_text='默认"[]"，用于用户只有对应工单查看权限时显示哪些字段,field_key的list的json,如["days","sn"],内置特殊字段participant_info.participant_name:当前处理人信息(部门名称、角色名称)，state.state_name:当前状态的状态名,workflow.workflow_name:工作流名称')