作者 wanweibin

修复正则中 sub函数匹配字符串而不是数字

@@ -38,7 +38,7 @@ class CreateProject(CreateAPIView): @@ -38,7 +38,7 @@ class CreateProject(CreateAPIView):
38 serializer.save(creator=request.user, auditor=Auditor.objects.order_by('-order').all()) 38 serializer.save(creator=request.user, auditor=Auditor.objects.order_by('-order').all())
39 # 企业微信推送 39 # 企业微信推送
40 obj_dict = serializer.data 40 obj_dict = serializer.data
41 - url = re.sub("PK", obj_dict['id'], FRONT_URL['flow_detail']) 41 + url = re.sub("PK", str(obj_dict['id']), FRONT_URL['flow_detail'])
42 first_auditor = User.objects.filter(pk=AUDITORS[0][0]).first() 42 first_auditor = User.objects.filter(pk=AUDITORS[0][0]).first()
43 wx_client.push_card(first_auditor.wx_token, url, f"{request.user.username}提交了一个产品立项申请") 43 wx_client.push_card(first_auditor.wx_token, url, f"{request.user.username}提交了一个产品立项申请")
44 wx_client.push_card(request.user.wx_token, url, u"流程创建成功") 44 wx_client.push_card(request.user.wx_token, url, u"流程创建成功")
@@ -95,7 +95,7 @@ class AuditProject(UpdateAPIView): @@ -95,7 +95,7 @@ class AuditProject(UpdateAPIView):
95 95
96 wx_client = WxPushHelper() 96 wx_client = WxPushHelper()
97 full_audit_done = self._check_audit(obj) 97 full_audit_done = self._check_audit(obj)
98 - url = re.sub("PK", obj.id, FRONT_URL['flow_detail']) 98 + url = re.sub("PK", str(obj.id), FRONT_URL['flow_detail'])
99 desc = "产品立项流程所有审批已完成" if full_audit_done else f"{request.user.username}已审批完成" 99 desc = "产品立项流程所有审批已完成" if full_audit_done else f"{request.user.username}已审批完成"
100 if full_audit_done: 100 if full_audit_done:
101 obj.is_done = True 101 obj.is_done = True