作者 陈志颖

fix:员工状态过滤

@@ -366,3 +366,68 @@ @@ -366,3 +366,68 @@
366 } 366 }
367 2020/11/22 13:54:02.083 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606024441976713000 BodyData:{"code":0,"data":{"currentEmployeeContributions":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":15917.3,"Ranking":2},"currentEmployeeWealth":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeeSuMoney":9890.3,"Ranking":2},"employeesContributions":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":77800,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":15917.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeesContributions":-3068,"Ranking":3},{"Uid":3259769336070144,"EmployeeName":"杜迁","EmployeesContributions":-6665,"Ranking":4},{"Uid":3259769336037376,"EmployeeName":"朱贵2","EmployeesContributions":-6975,"Ranking":5},{"Uid":3259769336137728,"EmployeeName":"杨志358","EmployeesContributions":-6990.2,"Ranking":6},{"Uid":3288265494991872,"EmployeeName":"李四","EmployeesContributions":-10289.5,"Ranking":7},{"Uid":3259769336317952,"EmployeeName":"陈达","EmployeesContribu 367 2020/11/22 13:54:02.083 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606024441976713000 BodyData:{"code":0,"data":{"currentEmployeeContributions":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":15917.3,"Ranking":2},"currentEmployeeWealth":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeeSuMoney":9890.3,"Ranking":2},"employeesContributions":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":77800,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":15917.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeesContributions":-3068,"Ranking":3},{"Uid":3259769336070144,"EmployeeName":"杜迁","EmployeesContributions":-6665,"Ranking":4},{"Uid":3259769336037376,"EmployeeName":"朱贵2","EmployeesContributions":-6975,"Ranking":5},{"Uid":3259769336137728,"EmployeeName":"杨志358","EmployeesContributions":-6990.2,"Ranking":6},{"Uid":3288265494991872,"EmployeeName":"李四","EmployeesContributions":-10289.5,"Ranking":7},{"Uid":3259769336317952,"EmployeeName":"陈达","EmployeesContribu
368 2020/11/22 13:54:02.083 [D] [server.go:1925] | 127.0.0.1| 200 | 106.60985ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list 368 2020/11/22 13:54:02.083 [D] [server.go:1925] | 127.0.0.1| 200 | 106.60985ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  369 +2020/11/22 13:59:18.845 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606024758845580000
  370 + Auth=
  371 + BodyData:{
  372 + "companyId": 311,
  373 + "uid": 3259769336174592,
  374 + "rankingType": 1,
  375 + "offset": 0,
  376 + "limit": 20
  377 +}
  378 +2020/11/22 13:59:18.909 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606024758845580000 BodyData:{"code":0,"data":{"currentEmployeeContributions":null,"currentEmployeeWealth":null,"employeesContributions":null,"employeesWealth":[{"Uid":3242227175192320,"EmployeeName":"卞信华","EmployeeSuMoney":-216,"Ranking":1}]},"msg":"ok"}
  379 +2020/11/22 13:59:18.909 [D] [server.go:1925] | 127.0.0.1| 200 | 64.387056ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  380 +2020/11/22 13:59:31.575 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606024771575328000
  381 + Auth=
  382 + BodyData:{
  383 + "companyId": 311,
  384 + "uid": 3242227175192320,
  385 + "rankingType": 1,
  386 + "offset": 0,
  387 + "limit": 20
  388 +}
  389 +2020/11/22 13:59:31.678 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606024771575328000 BodyData:{"code":0,"data":{"currentEmployeeContributions":null,"currentEmployeeWealth":{"Uid":3242227175192320,"EmployeeName":"卞信华","EmployeeSuMoney":-216,"Ranking":1},"employeesContributions":null,"employeesWealth":[{"Uid":3242227175192320,"EmployeeName":"卞信华","EmployeeSuMoney":-216,"Ranking":1}]},"msg":"ok"}
  390 +2020/11/22 13:59:31.678 [D] [server.go:1925] | 127.0.0.1| 200 | 103.536973ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  391 +2020/11/22 13:59:40.059 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606024780059122000
  392 + Auth=
  393 + BodyData:{
  394 + "companyId": 381,
  395 + "uid": 3259769336174592,
  396 + "rankingType": 1,
  397 + "offset": 0,
  398 + "limit": 20
  399 +}
  400 +2020/11/22 13:59:40.393 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606024780059122000 BodyData:{"code":0,"data":{"currentEmployeeContributions":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":15917.3,"Ranking":2},"currentEmployeeWealth":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeeSuMoney":9890.3,"Ranking":2},"employeesContributions":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":77800,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":15917.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeesContributions":-3068,"Ranking":3},{"Uid":3259769336070144,"EmployeeName":"杜迁","EmployeesContributions":-6665,"Ranking":4},{"Uid":3259769336037376,"EmployeeName":"朱贵2","EmployeesContributions":-6975,"Ranking":5},{"Uid":3259769336137728,"EmployeeName":"杨志358","EmployeesContributions":-6990.2,"Ranking":6},{"Uid":3288265494991872,"EmployeeName":"李四","EmployeesContributions":-10289.5,"Ranking":7},{"Uid":3259769336317952,"EmployeeName":"陈达","EmployeesContribu
  401 +2020/11/22 13:59:40.393 [D] [server.go:1925] | 127.0.0.1| 200 | 334.464935ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  402 +2020/11/22 14:02:54.000 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606024974000759000
  403 + Auth=
  404 + BodyData:{
  405 + "companyId": 381,
  406 + "uid": 3259769336174592,
  407 + "rankingType": 1,
  408 + "offset": 0,
  409 + "limit": 20
  410 +}
  411 +2020/11/22 14:02:54.439 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606024974000759000 BodyData:{"code":0,"data":{"currentEmployeeContributions":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":15917.3,"Ranking":2},"currentEmployeeWealth":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeeSuMoney":9890.3,"Ranking":2},"employeesContributions":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":77800,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":15917.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeesContributions":-3068,"Ranking":3},{"Uid":3259769336070144,"EmployeeName":"杜迁","EmployeesContributions":-6665,"Ranking":4},{"Uid":3259769336037376,"EmployeeName":"朱贵2","EmployeesContributions":-6975,"Ranking":5},{"Uid":3259769336137728,"EmployeeName":"杨志358","EmployeesContributions":-6990.2,"Ranking":6},{"Uid":3288265494991872,"EmployeeName":"李四","EmployeesContributions":-10289.5,"Ranking":7},{"Uid":3259769336317952,"EmployeeName":"陈达","EmployeesContribu
  412 +2020/11/22 14:02:54.439 [D] [server.go:1925] | 127.0.0.1| 200 | 438.658205ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  413 +2020/11/22 14:06:56.612 [D] [server.go:2843] ====>Recv User:<nil> RequestId:GET./employees/?companyId=445&offset=0&limit=5&employeeNameMatch=.1606025216612870000
  414 + Auth=
  415 + BodyData:{}
  416 +2020/11/22 14:06:56.648 [D] [server.go:2843] <====Send RequestId:GET./employees/?companyId=445&offset=0&limit=5&employeeNameMatch=.1606025216612870000 BodyData:{"code":0,"data":{"count":0,"employees":[]},"msg":"ok"}
  417 +2020/11/22 14:06:56.648 [D] [server.go:1925] | 127.0.0.1| 200 | 35.460967ms| match| GET  /employees/ r:/employees/
  418 +2020/11/22 14:09:39.973 [I] [???:0] http server Running on http://:8082
  419 +2020/11/22 14:13:02.607 [D] [server.go:2843] ====>Recv User:<nil> RequestId:GET./employees/?companyId=445&offset=0&limit=5&employeeNameMatch=.1606025582607368000
  420 + Auth=
  421 + BodyData:{}
  422 +2020/11/22 14:13:02.663 [D] [server.go:2843] <====Send RequestId:GET./employees/?companyId=445&offset=0&limit=5&employeeNameMatch=.1606025582607368000 BodyData:{"code":0,"data":{"count":0,"employees":[]},"msg":"ok"}
  423 +2020/11/22 14:13:02.672 [D] [server.go:1925] | 127.0.0.1| 200 | 64.653627ms| match| GET  /employees/ r:/employees/
  424 +2020/11/22 14:13:18.370 [D] [server.go:2843] ====>Recv User:<nil> RequestId:GET./employees/?companyId=445&offset=0&limit=5&employeeNameMatch=&status=1.1606025598370363000
  425 + Auth=
  426 + BodyData:{}
  427 +2020/11/22 14:13:18.414 [D] [server.go:2843] <====Send RequestId:GET./employees/?companyId=445&offset=0&limit=5&employeeNameMatch=&status=1.1606025598370363000 BodyData:{"code":0,"data":{"count":0,"employees":[]},"msg":"ok"}
  428 +2020/11/22 14:13:18.414 [D] [server.go:1925] | 127.0.0.1| 200 | 44.233098ms| match| GET  /employees/ r:/employees/
  429 +2020/11/22 14:14:25.291 [D] [server.go:2843] ====>Recv User:<nil> RequestId:GET./employees/?companyId=311&offset=0&limit=5&employeeNameMatch=&status=1.1606025665291391000
  430 + Auth=
  431 + BodyData:{}
  432 +2020/11/22 14:14:25.301 [D] [server.go:2843] <====Send RequestId:GET./employees/?companyId=311&offset=0&limit=5&employeeNameMatch=&status=1.1606025665291391000 BodyData:{"code":0,"data":{"count":2,"employees":[{"employeeId":67,"companyId":311,"employeeInfo":{"uid":3242227175192320,"employeeName":"卞信华","employeeAccount":"18900000000","employeeAvatarUrl":"http://suplus-business-admin-test.fjmaimaimai.com//images/default/default_avatar.png","isPrincipal":true},"suMoney":980,"status":1,"permissions":[1,2,3]},{"employeeId":491,"companyId":311,"employeeInfo":{"uid":3241342564574976,"employeeName":"测试1","employeeAccount":"15659378086","employeeAvatarUrl":"http://suplus-business-admin-test.fjmaimaimai.com//images/default_avatar.png","isPrincipal":false},"suMoney":99,"status":1,"permissions":null}]},"msg":"ok"}
  433 +2020/11/22 14:14:25.301 [D] [server.go:1925] | 127.0.0.1| 200 | 10.269229ms| match| GET  /employees/ r:/employees/
@@ -139,7 +139,7 @@ func (repository *EmployeeRepository) Find(queryOptions map[string]interface{}) @@ -139,7 +139,7 @@ func (repository *EmployeeRepository) Find(queryOptions map[string]interface{})
139 query = query.Where("employee.company_id = ?", companyId) 139 query = query.Where("employee.company_id = ?", companyId)
140 } 140 }
141 } 141 }
142 - if status, ok := queryOptions["status"]; ok { 142 + if status, ok := queryOptions["status"]; ok && status.(int) != 0 {
143 query = query.Where(`employee.status = ?`, status) 143 query = query.Where(`employee.status = ?`, status)
144 } 144 }
145 if isPrincipal, ok := queryOptions["isPrincipal"]; ok && isPrincipal.(bool) != false { 145 if isPrincipal, ok := queryOptions["isPrincipal"]; ok && isPrincipal.(bool) != false {