共创用户导入修改

@@ -310,7 +310,7 @@ type BatchAddUserItem struct {
 	// 共创公司 cooperationCompany
 	// 共创公司 cooperationCompany
 	CooperationCompany string `json:"cooperationCompany"`
 	CooperationCompany string `json:"cooperationCompany"`
 	// 共创到期时间 （yyyy-MM-dd） cooperationDeadline
 	// 共创到期时间 （yyyy-MM-dd） cooperationDeadline
-	CooperationDeadline time.Time `json:"cooperationDeadline"`
+	CooperationDeadline string `json:"cooperationDeadline"`
 
 
 	// 失败理由
 	// 失败理由
 	FailReason string `json:"failReason"`
 	FailReason string `json:"failReason"`

@@ -117,7 +117,7 @@ func (ptr *PgBatchAddUserService) BatchAddUser2(optUser *domain.OperateInfo, use
 			continue
 			continue
 			//return fmt.Errorf("导入的组织机构不存在:" + user.Org)
 			//return fmt.Errorf("导入的组织机构不存在:" + user.Org)
 		}
 		}
-		if dep, ok = mapOrg[user.Department]; !ok {
+		if dep, ok = mapOrg[user.Department]; !ok && user.UserType != domain.UserTypeCooperation {
 			user.FailReason = "导入的所属部门不存在:" + user.Department
 			user.FailReason = "导入的所属部门不存在:" + user.Department
 			failRows = append(failRows, user)
 			failRows = append(failRows, user)
 			continue
 			continue
@@ -128,13 +128,13 @@ func (ptr *PgBatchAddUserService) BatchAddUser2(optUser *domain.OperateInfo, use
 			UserType:       user.UserType,
 			UserType:       user.UserType,
 			UserCode:       user.UserCode,
 			UserCode:       user.UserCode,
 			OrganizationId: org.OrgId,
 			OrganizationId: org.OrgId,
-			DepartmentId:   dep.OrgId,
-			UserOrg:        []*domain.Org{},
-			UserRole:       []*domain.Role{},
-			FavoriteMenus:  []string{},
+			//DepartmentId:   dep.OrgId,
+			UserOrg:       []*domain.Org{},
+			UserRole:      []*domain.Role{},
+			FavoriteMenus: []string{},
 			CooperationInfo: &domain.CooperationInfo{
 			CooperationInfo: &domain.CooperationInfo{
-				CooperationCompany:  user.CooperationCompany,
-				CooperationDeadline: user.CooperationDeadline,
+				CooperationCompany: user.CooperationCompany,
+				//CooperationDeadline: user.CooperationDeadline,
 			},
 			},
 			UserInfo: &domain.UserInfo{
 			UserInfo: &domain.UserInfo{
 				UserName: user.UserName,
 				UserName: user.UserName,
@@ -147,11 +147,23 @@ func (ptr *PgBatchAddUserService) BatchAddUser2(optUser *domain.OperateInfo, use
 				Phone:    user.Phone,
 				Phone:    user.Phone,
 				UserName: user.UserName,
 				UserName: user.UserName,
 				OrgName:  org.OrgName,
 				OrgName:  org.OrgName,
-				DepName:  dep.OrgName,
+				//DepName:  dep.OrgName,
 			},
 			},
 			CreatedAt: time.Now(),
 			CreatedAt: time.Now(),
 			UpdatedAt: time.Now(),
 			UpdatedAt: time.Now(),
 		}
 		}
+		if dep != nil {
+			newUser.DepartmentId = dep.OrgId
+			newUser.Ext.DepName = dep.OrgName
+		}
+		if len(user.CooperationDeadline) > 0 {
+			newUser.CooperationInfo.CooperationDeadline, err = time.Parse("2006-01-02", user.CooperationDeadline)
+			if err != nil {
+				user.FailReason = fmt.Sprintf("共创到期时间格式有误 (例如:2001-01-01)")
+				failRows = append(failRows, user)
+				continue
+			}
+		}
 		if newUser, err = createUserService.CreateUser(nil, newUser, password); err != nil {
 		if newUser, err = createUserService.CreateUser(nil, newUser, password); err != nil {
 			user.FailReason = err.Error()
 			user.FailReason = err.Error()
 			failRows = append(failRows, user)
 			failRows = append(failRows, user)