Merge branch 'master' of 10.10.14.250:huanghai/dsMin

dsBaseRpc/RpcService/BasePosition/BasePositionDao/BasePositionDao.go

@@ -14,6 +14,14 @@ var db = DbUtil.Engine
 
 //增加
 func AddBasePosition(model models.TBasePosition) (int64, error) {
+	if model.SortId == 0 {
+		sql := `select ifnull(max(sort_id),0) as maxSortId from t_base_position where parent_id=?`
+		list, err := db.SQL(sql, model.ParentId).Query().List()
+		if err != nil {
+			return -1, err
+		}
+		model.SortId = int32(list[0]["maxSortId"].(int64) + 1)
+	}
 	return db.Insert(model)
 }
 

dsBaseRpc/RpcService/BasePosition/BasePositionService/BasePositionService.go

@@ -53,6 +53,7 @@ func (s *Rpc) AddBasePosition(ctx context.Context, in *BasePositionProto.ModelAr
 	model.OrgType = in.OrgType
 	model.Xxbxlxm = in.Xxbxlxm
 	model.PostionFlag = 1 //职务肯定是1
+	//parent_id-->下-->找出最大的sort_id+1
 	model.SortId = in.SortId
 	model.MaintainId = "011" //增加，删除，修改
 	model.BUse = 1