Merge remote-tracking branch 'origin/test' into dev

@@ -262,11 +262,17 @@ func (handler ZKClockHandler) BioData(entity BIODATAEntity) (DownEntity, error)
 	if len(userBase.UserInfo.FacePortrait) == 0 && len(entity.Tmp) > 0 && entity.Type == "9" {
 	if len(userBase.UserInfo.FacePortrait) == 0 && len(entity.Tmp) > 0 && entity.Type == "9" {
 		userBase.UserInfo.FacePortrait = entity.Tmp
 		userBase.UserInfo.FacePortrait = entity.Tmp
 		updateFlag = true
 		updateFlag = true
+		if len(GlobalTerminalManager.TerminalDeviceList) >= 1 { //TODO:后期移除掉，多台设备时才进行广播
+			event.Fire(DownEntityEvent, map[string]interface{}{"entity": NewUpdateUserFacePortraitDownEntity(generateSn(), entity.Pin, entity.Tmp)})
+		}
 	}
 	}
 	// 请求 人脸识别-指纹
 	// 请求 人脸识别-指纹
 	if len(userBase.UserInfo.FingerprintPortrait) == 0 && len(entity.Tmp) > 0 && entity.Type == "1" {
 	if len(userBase.UserInfo.FingerprintPortrait) == 0 && len(entity.Tmp) > 0 && entity.Type == "1" {
 		userBase.UserInfo.FingerprintPortrait = entity.Tmp
 		userBase.UserInfo.FingerprintPortrait = entity.Tmp
 		updateFlag = true
 		updateFlag = true
+		if len(GlobalTerminalManager.TerminalDeviceList) >= 1 {
+			event.Fire(DownEntityEvent, map[string]interface{}{"entity": NewUpdateUserFingerprintPortraitDownEntity(generateSn(), entity.Pin, entity.Tmp)})
+		}
 	}
 	}
 	if updateFlag {
 	if updateFlag {
 		_, err = userBaseRepository.Save(userBase)
 		_, err = userBaseRepository.Save(userBase)

@@ -11,7 +11,7 @@ import (
 type SyncToAttendanceMachineCommand struct {
 type SyncToAttendanceMachineCommand struct {
 	OperateInfo *domain.OperateInfo `json:"-"`
 	OperateInfo *domain.OperateInfo `json:"-"`
 	// 用户关联的角色
 	// 用户关联的角色
-	Users []int64 `cname:"用户关联的角色" json:"userIds" valid:"Required"`
+	Users []string `cname:"用户关联的角色" json:"userIds"`
 }
 }
 
 
 func (syncToAttendance *SyncToAttendanceMachineCommand) Valid(validation *validation.Validation) {
 func (syncToAttendance *SyncToAttendanceMachineCommand) Valid(validation *validation.Validation) {

@@ -6,6 +6,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/application/user/command"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/application/user/command"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/infrastructure/utils"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/log"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/log"
 )
 )
 
 
@@ -24,11 +25,24 @@ func (userService *UserService) SyncToAttendanceMachine(cmd *command.SyncToAtten
 		transactionContext.RollbackTransaction()
 		transactionContext.RollbackTransaction()
 	}()
 	}()
 	userRepository, _, _ := factory.FastPgUser(transactionContext, 0)
 	userRepository, _, _ := factory.FastPgUser(transactionContext, 0)
-
-	_, users, err := userRepository.Find(map[string]interface{}{"companyId": cmd.OperateInfo.CompanyId, "inUserIds": cmd.Users})
+	orgRepository, _, _ := factory.FastPgOrg(transactionContext, 0)
+	var users []*domain.User
+	// 指定用户进行同步
+	if len(cmd.Users) > 0 {
+		_, users, err = userRepository.Find(map[string]interface{}{"companyId": cmd.OperateInfo.CompanyId, "inUserIds": utils.ToArrayInt64(cmd.Users)})
+		if err != nil {
+			return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+		}
+	} else {
+		org, _ := orgRepository.FindOne(map[string]interface{}{"companyId": cmd.OperateInfo.CompanyId, "orgName": "制造中心"})
+		if org == nil {
+			return nil, nil
+		}
+		_, users, err = userRepository.Find(map[string]interface{}{"companyId": cmd.OperateInfo.CompanyId, "inDepartmentIds": []int64{org.OrgId}})
 		if err != nil {
 		if err != nil {
 			return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 			return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 		}
 		}
+	}
 
 
 	for i := range users {
 	for i := range users {
 		_, userBase, err := factory.FastPgUserBase(transactionContext, users[i].UserBaseId)
 		_, userBase, err := factory.FastPgUserBase(transactionContext, users[i].UserBaseId)

@@ -213,6 +213,9 @@ func (repository *UserRepository) Find(queryOptions map[string]interface{}) (int
 	if v, ok := queryOptions["inCompanyIds"]; ok && len(v.([]int64)) > 0 {
 	if v, ok := queryOptions["inCompanyIds"]; ok && len(v.([]int64)) > 0 {
 		query.Where(`company_id in (?)`, pg.In(v))
 		query.Where(`company_id in (?)`, pg.In(v))
 	}
 	}
+	if v, ok := queryOptions["inDepartmentIds"]; ok && len(v.([]int64)) > 0 {
+		query.Where(`department_id in (?)`, pg.In(v))
+	}
 	query.SetWhereByQueryOption("user_code = ?", "userCode")
 	query.SetWhereByQueryOption("user_code = ?", "userCode")
 	query.SetWhereByQueryOption("ext->>'icCardNumber' = ?", "icCardNumber")
 	query.SetWhereByQueryOption("ext->>'icCardNumber' = ?", "icCardNumber")
 	query.SetWhereByQueryOption("user_base_id=?", "userBaseId")
 	query.SetWhereByQueryOption("user_base_id=?", "userBaseId")

@@ -262,3 +262,12 @@ func CopyObject(src, dst interface{}) {
 		}
 		}
 	}
 	}
 }
 }
+
+func ToArrayInt64(inputs []string) []int64 {
+	result := make([]int64, 0)
+	for i := range inputs {
+		v, _ := strconv.ParseInt(inputs[i], 10, 64)
+		result = append(result, v)
+	}
+	return result
+}