正在显示
2 个修改的文件
包含
6 行增加
和
0 行删除
| @@ -163,6 +163,9 @@ func (s SelfChecks) Compare(dst string) (rspChecks SelfChecks, err error) { | @@ -163,6 +163,9 @@ func (s SelfChecks) Compare(dst string) (rspChecks SelfChecks, err error) { | ||
| 163 | for i := range s { | 163 | for i := range s { |
| 164 | c := s[i] | 164 | c := s[i] |
| 165 | if v, ok := mapChecks[c.Key()]; ok { | 165 | if v, ok := mapChecks[c.Key()]; ok { |
| 166 | + if len(c.Answer) == 0 { | ||
| 167 | + continue | ||
| 168 | + } | ||
| 166 | //回答不一致 | 169 | //回答不一致 |
| 167 | if !strings.EqualFold(c.Answer, v.Answer) { | 170 | if !strings.EqualFold(c.Answer, v.Answer) { |
| 168 | rspChecks = append(rspChecks, c) | 171 | rspChecks = append(rspChecks, c) |
| @@ -552,6 +552,9 @@ func ChanceApproveProcess(header *protocol.RequestHeader, chance *models.Chance) | @@ -552,6 +552,9 @@ func ChanceApproveProcess(header *protocol.RequestHeader, chance *models.Chance) | ||
| 552 | Name: process.UserName, | 552 | Name: process.UserName, |
| 553 | } | 553 | } |
| 554 | utils.JsonUnmarshal(process.SelfChecks, &item.SelfChecks) | 554 | utils.JsonUnmarshal(process.SelfChecks, &item.SelfChecks) |
| 555 | + if len(item.SelfChecks) > 0 { | ||
| 556 | + item.SelfChecks.ClearEmpty() | ||
| 557 | + } | ||
| 555 | if item.ApproveType == protocol.AuditBySpecailUser { | 558 | if item.ApproveType == protocol.AuditBySpecailUser { |
| 556 | item.ApproveType = protocol.AuditByUser | 559 | item.ApproveType = protocol.AuditByUser |
| 557 | } | 560 | } |
-
请 注册 或 登录 后发表评论