物料保存

rpc/internal/logic/materialsavelogic.go

@@ -43,9 +43,9 @@ func (l *MaterialSaveLogic) MaterialSave(in *pb.MaterialSaveReq) (*pb.MaterialSa
 	}
 
 	//获取分发人的userid
-	userIdArr := service.GetSendUserId(in.ReceiveUserId, in.EntId)
+	userIdArr, userIdMap := service.GetSendUserId(in.ReceiveUserId, in.EntId)
 	positionArr := strings.Split(in.ReceiveUserId, ",")
-	userIdMap := service.GetUserIds(in.ReceiveUserId)
+	//userIdMap := service.GetUserIds(in.ReceiveUserId)
 	//log.Println("userIdMap", userIdMap)
 	for k, v := range strings.Split(in.ReceiveUserName, ",") {
 		personCode := service.GetPersonCode(gconv.Int64(positionArr[k]), v, userIdMap[common.IntAll(positionArr[k])])

service/material.go

@@ -59,18 +59,20 @@ func MaterialSave(in *pb.MaterialSaveReq, title, content string) (msgId, mId int
 	return msgId, mId, nil
 }
 
-func GetSendUserId(positionIds string, entId int64) []string {
+func GetSendUserId(positionIds string, entId int64) ([]string, map[int]string) {
 	//拿职位id找mgoid
 	userIdArr := []string{}
-	query := fmt.Sprintf("SELECT userid FROM data_service.user_system WHERE position_id in (%s) AND ent_id = %d", positionIds, entId)
+	res := map[int]string{}
+	query := fmt.Sprintf("SELECT userid,position_id FROM data_service.user_system WHERE  status = 1 AND position_id in (%s) AND ent_id = %d", positionIds, entId)
 	log.Println("查找分发人的sql", query)
 	useridMap := entity.JyBiTidb.SelectBySql(query)
 	if useridMap != nil && len(*useridMap) > 0 {
 		for _, val := range *useridMap {
 			userIdArr = append(userIdArr, gconv.String(val["userid"]))
+			res[common.IntAll(val["position_id"])] = common.InterfaceToStr(val["userid"])
 		}
 	}
-	return userIdArr
+	return userIdArr, res
 }
 
 func PersonImageSave(imgUrl string, msgId, positionId, materialsId int64) bool {